Turn on whitespace-mode for all programming.
Whitespace cleanups.
Updated RVM
Turning off electric-pair-mode.
Removing solarized.
More spelling abbrevs
Whitespace changes.
emacsclient is my EDITOR now.
Improving Python setup.

Conflicts:
	.emacs.d/init-package.el
	.emacs.d/init.el
More spelling abbrevs.
Making additional low-importance cyrus.2U mail folders.

Conflicts:
	.emacs.d/init-gnus.el
Allowing more commands for multiple-cursors.
WORK: Work machine specific email setup.
WORK: Adding alias to launch emacs on sandbox.
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