vagrant lucid32 tweaks
settle merge conflicts
remove unneccessary comment