Merge branch 'master' of github.com:brodriguesneto/pickaxe

Conflicts:
	Vagrantfile
Merge branch 'master' of github.com:brodriguesneto/pickaxe