Use 14.04 + actually do the right thing on startup.
Merge branch 'master' of https://github.com/eiriksm/brewers-beard-vagrant

Conflicts:
	bootstrap.sh