dotfiles-comet commit for Wed Sep 24 03:35:08 MDT 2014
Merge branch 'master' of https://github.com/pharpend/dotfiles

Conflicts:
	.emacs.d/abbrev_defs