* 'master' of git@github.com:bjeanes/dot-files:
More fish config
Renamed a lot of @ben_h's git aliases to the ones used at the office
Added stuff from fish-nuggets and changed behaviour of a few
Fish configuration from benhoskings
Lots of changes over last few weeks
the colorize option for ls is different on linux and darwin
Reorganising slightly to hopefully work on Linux
Conflicts:
aliases