Enable branch coverage

(I did some cleanup of the pytest commands as well)
You have different options passed to `nosetests` for integration which enables verbose mode. Verbose mode in `py.test` is rather useless so i leave it off. Not sure that `-v` in `nosetests` is much better though...