Updating.
Merge branch 'umaster' into clean_master

Conflicts:
	.travis.yml
Enhanced (but commented out travis file).
Travis cleanup.
Cleaned up untracked files and updated .gitignore.
Merge branch 'master' of https://github.com/irjudson/codalab