Updated template handling
Merge branch 'master' of github.com:muellerj/hello-sinatra