Take mainstream version of gcovr
Merge pull request #28 from Metaswitch/gcovr_update

[Reviewer: Andy] Take mainstream version of gcovr