Updated Gruntfile for more effective dev and build management. Updated main content files to move to main build branch.