sync
TODO: ocp-indent would call turag which crashes my emacs
Merge branch 'master' of github.com:bobzhang/emacs

Conflicts:
	.emacs