Add a couple more git alias
Merge branch 'master' of git://github.com/Phunky/dotfiles

* 'master' of git://github.com/Phunky/dotfiles:
  Add ls alias
Merge branch 'master' of git://github.com/Phunky/dotfiles

* 'master' of git://github.com/Phunky/dotfiles:
  Remove anything OSX'y and move some stuff about
  Add node path
Add --color to LS alias
Merge branch 'master' of https://github.com/Phunky/dotfiles

* 'master' of https://github.com/Phunky/dotfiles:
  Add color file
  Update aliases for commonly used SSH accounts