Swap highlight-indentation for indent-guide
Merge branch 'master' of github.com:MatthewDarling/.emacs