Minor change to test travis PR support
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	.travis.yml
Ensure that ml grading test looks for correct return value
Try to make travis work without timing out (>10 mins can time out)
Fake commit
Will removing apt-packages make travis work?
Apparently not!
Merge pull request #57 from edx/dev

Minor change to test travis PR support