Updated my dotfiles.
Merge branch 'master' of github.com:brendan/dotfiles

Conflicts:
	bash_login
	bashrc_global