Testing with grunt
Updated make and travis