Prefer install of emacs modes through apt-get
Merge branch 'apt-emacs-modes' of git://github.com/AltGr/vagrant-opam

Conflicts:
	bootstrap.sh