defaults
Merge branch 'master' of http://github.com/davidstanley01/dotfiles

* 'master' of http://github.com/davidstanley01/dotfiles:
  adjusting terminal and aliases
  stuffs
  hg stuffs, again
  hg stuffs, again
  added prompt stuff for hg