fix tokumx stuff in emacs conf
misc fixes
Merge branch 'master' of github.com:leifwalsh/df