Two spaces for tabs.  Some cleanup.
Merge branch 'master' of github.com:tobinjt/dotfiles