Merge branch 'master' of https://github.com/garaemon/garaemon-settings
new alias: e and en to emacsclient
Merge branch 'master' of github.com:garaemon/garaemon-settings

Conflicts:
	resources/rcfiles/zshrc
add wakatime script