Merge branch 'drush_fix'
Merge branch 'apache_php_fix'
Merge branch 'drush_filename'
Merge branch 'drush_filename'
Merge branch 'drush_filename'
Merge branch 'solr_46'
Removing the need for separate platform on vhost
Updating apache and redis modules
Remove the other web sever if it's changed from nginx to apache or
vice-versa
Updating version
Merge branch 'master' into 1.1.x