fix up tests, switch npm test to grunt, update travis.yml