Cleaned up code and updated dependencies to refer to post-Grunt files and locations.
Updated Gruntfile