Update dotfiles
Merge branch 'master' of github.com:carlallen/dotfiles

Conflicts:
	.profile