Clean up .bashrc a little
Merge branch 'master' of github.com:dansackett/dotfiles
Resolve merge conflict
Tags seems to be working well now..