Updated Makefile
Updated web2py setup script.
Removed infovis_mallet application symlink.
Merge branch 'master' of github.com:uwdata/termite-data-server

Conflicts:
	Makefile