dotfiles/comet commit for Tue Feb 25 17:02:04 MST 2014
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	.emacs.d/url/cookies