Merge pull request #1031 from davehunt/desktop-skips

Desktop skips & fixes
Merge pull request #1057 from davehunt/fix-expected-failure

Fixed the expected failure in test_debug for marionette-client 0.5.33
Merge pull request #1060 from davehunt/tbpl-manifest

Created a manifest file for TBPL
Picking up 0.5.34 of marionette_client, see bug 889469.
Added optional HTML report
Improvements to the HTML output
Further improvements to the HTML report. Now reports are entirely self-contained.
Improve readability of settings debug in HTML report
Fixed issues with version number and console output