removing gpg specific info
Merge branch 'master' of git://github.com/kevinlangleyjr/dotfiles

* 'master' of git://github.com/kevinlangleyjr/dotfiles:
  removing gpg info and moving osx specific aliases into osx.sh
  adding color specific to root