Enhanced Grunt build process
Branch Cleanup