Set a few more options.
Misc clean up.
Merge branch 'master' of github.com:omh/dotfiles