Now run tests with Grunt
Fixed a couple of minor bugs
Amended to pass the test
Amended Travis config