Moved the travis scripts back to using npm test
Made npm test go to grunt test, not grunt watchtest