confs and whatnot
added script to update ssh keys
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	tmux.conf
	zshrc