Enable syntax coloring and update .gitmodules
Merge branch 'master' of https://github.com/daleroberts/dotfiles