Auto-add key when there's none in the keychain
Moved all theme stuff out
Merge branch 'master' of github.com:oholiab/zshrc

Conflicts:
	.zshrc