Uniform folder names for tools.
Merge branch 'master' of github.com:uwdata/termite-server
Updated Makefile.