Fixing tabs vs. space problem.
Dumb typo when setting up clojure-mode-hook.
More abbrevs
More things to do with multiple-cursors
Experimenting with new font.
Enabling rerere

Conflicts:
	.gitconfig
Fixing typo in init-misc.
Fixing machine update script.
More Abbrevs.

Conflicts:
	.emacs.d/abbrev_defs
Fixing tabs vs. space problem.
WORK: Work machine specific email setup.
WORK:2U: Adding local machine aliases for 2U project
WORK: Adding init-irc (after extracting secrets)
2U: Sandbox GIT is older - need special handling.
2U: project settings.

Conflicts:

	.bash_profile
	.bashrc
	.vim/vundle.vim
	.vimrc
Changing how my project scripts work.

Now instead of a set of aliases per project there is one dispatch
function which picks a script to run based upon the directory name.
No longer need these api.
Passing parameters through the dispatcher.
Making sure service unit tests are run.
Working on fixing an annoying dbconf problem.