Modified updatesubtrees
Merge branch 'master' of github:pcdude2143/dotfiles

Conflicts:
	.hgext/hgshelve/hgshelve.pyc