Fix startup scripts for emacs and sublime
Fix the apt repo that we pull
Merge branch 'master' of https://github.com/cs3110/vagrant-opam

Conflicts:
	setup-emacs.sh
	setup-sublime.sh