Update versions
Merge branch 'master' of github:nurelm/spree_vagrant

Conflicts:
	bootstrap.sh