Merge pull request #7 from hfaran/dev

Use pytest rather than tox for Travis-CI compatibility
Merge pull request #8 from hfaran/dev

Add JSON highlighting to generated API documentation
Display coverage for master
Bump version