Added grunt and jasmine
Some minor changes