Merge branch 'vagrant' of git://github.com/omribahumi/OpenPress into omribahumi-vagrant

Conflicts:
	.gitignore
	Vagrantfile