Move aliases around get color ls
Merge branch 'master' of github.com:JohnReid/dotfiles