First pass on jshint, grunt test passes
Passing JSCS