Enable rainbow-mode when editing any *-theme.el files
Fix trailing reference to ac-nrepl
Enable goto-address-mode in git-commit-mode
Merge remote-tracking branch 'origin/master'