Merge pull request #1 from ryandjurovich/develop

Removed use of "manifest" files, now using standard Twig template files