fix nose version 1.1.2
Merge branch 'vagrant'

Conflicts:
	vagrant/bootstrap.sh