misc changes
Merge branch 'master' of github.com:czlee/tabbycat
Collecting the stray template