Grunt support, added first changes for JsLint Compliance