Updated model descriptions in demo.sh.
Enable importation of folders in train_gensim.py
Fixed empty token issues in train_gensim.py
Updated setup scripts. Added Makefile for development use.
Merge branch 'master' of github.com:uwdata/termite-server

Conflicts:
	Makefile