local
Merge branch 'master' of github.com:nbirnel/dotfiles

Conflicts:
	.bashrc
	.config/gitp/dot/info/exclude
Merge branch 'master' of github.com:nbirnel/dotfiles
Merge branch 'master' of github.com:nbirnel/dotfiles