Merge branch 'master' of github.com:gregorywright/dotfiles
new history stuff for bash