Merge PR #305
travis yml?
Merge branch 'master' of https://github.com/codalab/codalab

Conflicts:
	.travis.yml
Fix change in logic to locate config file: env.cfg_path must be set before it is first read.
Merge pull request #310 from cpoulain/master

Fix change in logic to locate config file: env.cfg_path must be set befo...
Merge branch 'master' of https://github.com/codalab/codalab