change template / osx scripts
Merge branch 'master' of github.com:jaypei/exz-conf

Conflicts:
	emacsconf/emacs.d/etc-lisp/exz-init.el