Minor tweak to bashrc-common, fixed uk proxy definition
Merge branch 'master' of ssh://github.com/Stabledog/bin-pub

Conflicts:
	bashrc-common
Fixed gitconfig