Update setup script and gitignore file
Merge branch 'develop' of https://github.com/raph/snow into develop

Conflicts:
	vagrant/snow/setup.sh