Cleanup and Template Includes

Continued cleanup of the original plugin and started adding t he ability
to include templates within the plugin.