Coverage working again

Got coverage working again after some pain.  Turns out, coverage combine
will combine anything that matches `.coverage.*` which is convient since
I didn't want to have to generate a random string for the filename
(because I'm lazy).  That's why you'll see time.time() used to rename
the file
Merge pull request #17 from abraithwaite/develop

Coverage working again