dotfiles-comet commit for Thu Aug  7 21:45:01 MDT 2014
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	.emacs.d/config/ftopts.el