Seperate the various media types, allowing them to fail/timeout independently. Also opens up the possibility of asserting file counts for each type.
Remove uneccessary second call to get all media
Avoid overriding the script timeout when restarting B2G
Merge pull request #945 from davehunt/v1.0.1

Pull #938 for v1.0.1