things
Merge branch 'master' of https://github.com/jmesmon/dotfiles

Conflicts:
	_.hgrc