Merge branch 'amcclure' of thunix/ansible into master

roles/shell/tasks/packages.yml

@@ -26,6 +26,25 @@
       - zsh
       - mosh
       - exim4
+      - htop
+      - libsdl1.2-dev
+      - php7.0
+      - libapache2-mod-php7.0
+      - php7.0-mysql
+      - php7.0-curl
+      - php7.0-gd
+      - php7.0-intl
+      - php-pear
+      - php-imagick
+      - php7.0-imap
+      - php7.0-mcrypt
+      - php-memcache
+      - php7.0-pspell
+      - php7.0-recode
+      - php7.0-sqlite3
+      - php7.0-tidy
+      - php7.0-xmlrpc
+      - php7.0-xsl
 
 - name: Install locally created bins
   copy:

roles/webserver/tasks/packages.yml

@@ -27,3 +27,4 @@
       - php7.0-tidy
       - php7.0-xmlrpc
       - php7.0-xsl
+      - vsftpd