many updates
Various
Various changes.
Merge branch 'master' of github.com:shawnpage/emacs.d

Resolved Conflicts:
	init.el