fix
Merge branch 'master' of https://github.com/cs3110/vagrant-opam

Conflicts:
	setup-sublime.sh