Updates
Merge branch 'master' of github.com:fsiegert/bootstrap

Conflicts:
	.bashrc.global