.emacs changes from workpc.
.emacs changes from workvm.
Merge branch 'master' of https://github.com/jasonmc/bits

Conflicts:
	.emacs