View templating and base forever.
Merge pull request #1 from StevenEBarbaro/master

grabbing upstream