Updated setup messages.
Added Makefile. Moved web2py to its own folder.
Added modified web2py to the repo.
Updated README.
Updated description to "data server" from "web server."
Ignore web2py files.
Added vis/TermTopicMatrix controller.
Ignore web2py files.
Include MALLET in the repo.
Removed setup.sh
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Merge branch 'master' of github.com:uwdata/termite-data-server

Conflicts:
	.gitignore
	Makefile
	README.md
	landing_src/views/default/index.html
	server_src/controllers/vis.py
Updated landing page text
Updated setup scripts to remove unneeded operations.
Updated ignored file list.