dotfiles-comet commit for Sun Sep 28 21:44:57 MDT 2014
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	.barinfo
dotfiles/comet commit for Sun Sep 28 22:06:04 MDT 2014