Updated with Grunt templating, newer packages. Many templates still broken.