Added .hgrc
Merge branch 'master' of github.com:iamthad/dotfiles
Moved commands into .bashrc and .bashrc_local
Moved ls alias to .bashrc_local
Accidentally added local file to repo.