Combine jstests and tests directories
Change `make test` to target `pytest` and `jstest`
Update `.travis.yml` so we don't run jstests twice
Move fixtures underneath py/
Merge pull request #2133 from gittip/merge-test-paths

Merge test paths