Adding slim extras (for Smarty View)
Merge branch 'master' of git://github.com/muldown/waffle