Fix requirements for travis
Merge remote-tracking branch 'origin/master' into vik/rename

Conflicts:
	requirements.txt
Merge pull request #24 from edx/vik/rename

Fix requirements for travis