Merge pull request #53 from edx/dev

Dev
Merge pull request #56 from edx/dev

Travis.yml?
Fix travis
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	.travis.yml