Add support for a custom public directory
Add comment indicating how to use public directory with apps
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge pull request #213 from dwightwatson/feature/public-folder

Add support for a custom public directory
Merge branch 'master' into develop
Made php optional

Made php optional by checking if php is installed when installing apache or nginx. Also removed some Trailingspace and empty comment lines from php.sh and Vagrantfile.
Added a PHP check before installing certain scripts