Updated CHANGELOG for upcoming release
Fixed issue accessing package resources for HTML report
Updated change log for upcoming release
Merge branch '2.0' of github.com:davehunt/pytest-mozwebqa into 2.0