Merge branch 'master' of https://github.com/morrifeldman/dotfiles

Conflicts:
	ssh_config
Merge branch 'master' of https://github.com/morrifeldman/dotfiles