Removed .bashrc_local reference.
Added punga to SSH hosts (with proxy info).
Improved man page colouring.
Merge branch 'master' into mac

Conflicts:
	bashrc