dotfiles/comet commit for Fri Feb 28 10:03:04 MST 2014
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	.murica.rb