Refactor
Merge branch 'master' into silex-doctrine

Conflicts:
	vagrant/install.sh
Use mysql config symlinked from project directory.