Removed wordpress install and made generic LAMP environment
fixed conflict in merging master with bug fix
Added www folder that syncs with /var/www
Added www folder that syncs with /var/www
Merge remote-tracking branch 'origin/master' into lamp-only
Updated Vagrantfile for LAMP only
Merge remote-tracking branch 'origin/master' into lamp-only
fixed merge issues with latest master
Updated ServerName conf from master
Merged bugfixes from master
Merged composer/mcrypt from master, changed virtual ip address to not conflict
Merge remote-tracking branch 'origin' into lamp-only
Simplified default database credentials
Fixed bug in default database credentials referring to reserved mysql database
Made ServerName a variable
fixed merge bug
Fixed bug in changing symlinked folder
Merged in changes from master
Added XDebug, refactored sites-enabled
Merge branch 'master' into lamp-only

Conflicts:
	provision.sh