updates
Merge branch 'master' of github.com:marten/dotfiles

Conflicts:
	ssh/ssh.symlink/config