New pretty reporter

Closes #301, fixes #258.
Merge branch 'master' into geezer
Fix missing semicolon
Merge branch 'master' into geezer