Update profile
Merge branch 'master' of https://github.com/cliph/dotfiles

Conflicts:
	home/.ssh/known_hosts