Merge grunt changes to use a single file in production

This pull requires includes Dain's sprint8-feature-task and sprint8-feature-grunt branches.  Tested on the demo server, looking for people to verify it is working correctly.