Add default editor setting
Merge branch 'master' into mac

Conflicts:
	.zshrc