Aliases made a wee bit more friendly
Git commit editor should be vim (subl, what was I thinking?)
Merge branch 'master' of git://github.com/user36634/.dotfiles

Conflicts:
	aliases
Merge branch 'master' of git://github.com/user36634/.dotfiles
Rearranged aliases a bit
Removed duplicate alias definitions
Merge branch 'master' of git://github.com/user36634/.dotfiles
Merge branch 'master' of git://github.com/user36634/.dotfiles