more renaming, templates
Merge pull request #39 from pfletch1023/paul

More renaming, template restructuring
Merge branch 'master' of github.com:pfletch1023/Gandalf into rafi