Update aliases, mostly zipcar ones.
Resove minor merge conflict
Merge branch 'master' of git://github.com/durrantm/setups-and-dotfiles
Make history unique, add git completion (for OSX)
Updated Aliases