Bunch of changes from cottonmouth
Merge branch 'master' of github.com:csand/dotfiles