Add colored output to ls
Merge branch 'master' of github.com:bond/dotfiles
Merge branch 'master' of github.com:bond/dotfiles
Merge branch 'master' of github.com:bond/dotfiles
Merge branch 'master' of github.com:bond/dotfiles
Merge branch 'master' of github.com:bond/dotfiles
Make check for marmalade work properly (avoid errors)