various modifications
Merge branch 'master' of github.com:jimjibone/dotfiles