adding buid-essential package for things that may need make/gcc (mailcatcher?)
Merge branch 'master' of github.com:fideloper/Vaprobash
added sturdier sudo-based solutino for php config of catchmail
Crontab needs the user defined
white space
Merge pull request #402 from remailednet/mailcatcher_crontab

Crontab needs the user defined
Minor type-o in git-ftp comment
Merge pull request #405 from remailednet/git_ftp_type-o

Minor type-o in git-ftp comment
Adding CPU Customization to Vagrantfile
Merge pull request #314 from dbpolito/patch-4

Adding CPU Customization to Vagrantfile
workaround for bug in Couchbase Client 2.0
added docker
Merge pull request #410 from shift31/master

workaround for bug in Couchbase client library 2.0
Merge pull request #412 from lukewaite/docker

Added docker provisioning
Merge branch 'master' into theand1404

Conflicts:
	Vagrantfile
	scripts/base.sh