merging some local changes
Merge branch 'master' of https://github.com/tkmharris/tom_tex
Merge branch 'master' of https://github.com/tkmharris/tom_tex