Merge pull request #11 from westonplatter/master

grunt configuration adjustments + solutions to jshint errors