Edit Vagrant file.
Merge branch 'master' of /home/johna/src/GeekyMenu/GeekyOSVagrant with conflicts.