update
Merge branch 'master' of github.com:roadman/dotfiles

Conflicts:
	.bashrc