Added a watch task to Grunt
Moved the travis scripts back to using npm test
Made npm test go to grunt test, not grunt watchtest
Cleaned up the grunt watcher so it caught failures
Merge branch 'develop' into feature/consumer