Update .travis.yml and .kitchen.yml files for parallel testing

Change-Id: I44879abb332bc0cc2633302142a42190a394d1f4
diff --git a/.travis.yml b/.travis.yml
index 9cb9872..39bfafe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,8 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty PHP_VERSION=php5
-    - PLATFORM=trevorj/salty-whales:xenial PHP_VERSION=php7
-
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=apache_server_php5
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=apache_server_php7
 
 before_script:
   - set -o pipefail