Add a mailmap.
Update the mailmap.
Update mailmap #2.
Add new Git aliases, Vim plugins and key mappings.
Merge branch 'master' of github.com:elkorn/dotfiles
Add ctags to installation scripts, update color scheme, add JS mappings.
Create the ubuntu branch.
Update the ubuntu branch.
Merge branch 'ubuntu' of github.com:elkorn/dotfiles into ubuntu

Conflicts:
	dotfiles/.vim/plugin/projects.vim