[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.
My customizations to zprezto
Add /opt/bin for diskstation and mac
Twiddle some modules a bit
Merge branch 'master' of github.com:emersonrp/prezto

Conflicts:
	runcoms/zpreztorc