Updated configs
Merge branch 'master' of github.com:jkimbo/dotfiles

Conflicts:
	git/gitconfig
	ssh/config
	zshrc