Added bashmarks to my dotfiles (see http://github.com/huyng/bashmarks)
Merge branch 'master' of github.com:djbobke/dotfiles

* 'master' of github.com:djbobke/dotfiles:
  Added LANG=C for htop in aliases because debian screwed everything up in my shell