Better path management
Merge branch 'master' of github.com:rshk/dotfiles

Conflicts:
	.common_profile