[Fix #398] Manually set locale
[Fix #396] Remove the osx trash function

The trash program found at http://hasseg.org/trash is a superior
implementation.
Add Emacs module

Enables Emacs dependency management with Carton.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	runcoms/zshenv