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

Change-Id: I44879abb332bc0cc2633302142a42190a394d1f4
diff --git a/.kitchen.yml b/.kitchen.yml
index 2ddf9a7..f220365 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -37,9 +37,14 @@
 
 suites:
 
-  - name: apache_server_<%=ENV['PHP_VERSION'] || 'php7'%>
+  - name: apache_server_php5
     provisioner:
       pillars-from-files:
-        apache.sls: tests/pillar/apache_server_<%=ENV['PHP_VERSION'] || 'php7'%>.sls
+        apache.sls: tests/pillar/apache_server_php5.sls
+
+  - name: apache_server_php7
+    provisioner:
+      pillars-from-files:
+        apache.sls: tests/pillar/apache_server_php7.sls
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125