Enable branch coverage

(I did some cleanup of the pytest commands as well)
@joshfriend should the same change happen for `nosetests`?