Templating fixes
Merge branch 'master' of https://github.com/ryanwebber/Fish.git