re-enable mediaSet unit test
run tests as one suite, so failures are easier to read
fix some failing tests
trying out travis CI service
sorting works down to the minute
Merge remote-tracking branch 'upstream/master'