Various sync ups
Merge branch 'master' of github.com:brettviren/dot-emacs