Havana

All your changes and mine are merged. Things vagrant up fine. Still has the odd Ubuntu issue, but I think you have a fix waiting in the wings.