switched e to point at subl
Merge branch 'master' of github.com:andyferra/oh-my-zsh

Conflicts:
	custom/aliases.zsh
updated EDITOR