Add missing bits from various hosts

Combining pieces from other hosts and cleaning up as I go here
Merge branch 'master' of https://github.com/mmessmore/dotfiles