Make JSHint pass
Refactor Gruntfile
Optimize directory structure; Clean up source code for Grunt
Merge branch 'grunt' into develop