Merge branch 'develop'
fixed php ssl detection

Changed fastcgi_param HTTPS back to on for PHP_WITH_SSL. Seems to have been accidentally changed when php was made optional.
Merge pull request #286 from joakimkejser/patch-1

fixed php ssl detection under nginx
Fixed README.md weirdness.

From 
**Va**grant **Pro**visioning **Bash** Scripts

To
**Va**&#x200B;grant **Pro**&#x200B;visioning **Bash** Scripts
Merge pull request #295 from RobinMalfait/patch-1

Fixed README.md weirdness.
Fix #305 and #306 - FPM socket needs to be readable by web servers
Merge branch 'develop'
updated php script, dont need socket settings
updated readme with 14.04 info
Merge branch 'develop'
Merge branch 'develop'
HHVM or PHP, but not both
fixing php bug
apache turns off default site
more comments for clarity
Merge branch 'master' into develop