Cleanup

Mostly minor modifications. Some aesthetic things, switch out `hosts.local` for `hosts`.

Successfully tested in Vagrant.