Latest changes.
Merge remote-tracking branch 'eco/master'

Conflicts:
	bashrc
	gitconfig
	gvimrc
	hgignore
	hgrc
Merge branch 'master' of github.com:rgeoghegan/personal

Conflicts:
	bashrc