Changed emacs alias on os x
Various updates