Symfony 2.3.1 boilerplate
Merge branch 'master' of github.com:harrenmedia/symfony-boilerplate

Conflicts:
	Vagrantfile
Removed .vagrant folder