Added psql bit to .zshrc
Merge branch 'master' of github.com:joshkehn/.config

Conflicts:
	.zshrc
	Preferences.sublime-settings