bashrc & others
Merge branch 'master' of https://github.com/jwest/_dotfiles

Conflicts:
	.gitconfig