Hopefully fixed the way tests are run
Merge branch 'master' of github.com:noahgoldman/textlink
Fixed Obj2JSON tests by actually getting it to use database objects
Updated travis file to use the new test running mechanism