Adding Vagrant
Adding cache and logs directories
Merge branch 'master' into unit

Conflicts:
	.gitignore