updated profile
Merge branch 'master' of https://github.com/aaschwanden/dotfiles

Conflicts:
	profile