fix options
Merge remote-tracking branch 'origin/master'
extend the cache
Merge remote-tracking branch 'origin/master'
improve how data is merged into the context, run tests
adds `_defaultLayout` method as a step towards externalizing or compartmentalizing that logic. also adds updated code comments for methods.
run verb
merge
Merge branch 'doowb'