Merge branch 'amcclure' of thunix/ansible into master

Commented out php7.0 from phoenix apache2 modules as it is currently not installed causing an error when running ansible-pull.

roles/shell/tasks/apache2-mods.yml

@@ -8,7 +8,7 @@
   apache2_module:
     name: ssl
     state: present
-- name: php7.0
+#- name: php7.0
-  apache2_module:
+#  apache2_module:
-    name: php7.0
+#    name: php7.0
-    state: present
+#    state: present