Better Option support
Merge pull request #13 from chrhicks/option_fix

 Better Option support
Merge branch 'master' of github.com:chrhicks/handlebars.scala