add prettify util to examples
locals are merged correctly
make zen example a helper
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/example.js
	index.js
remove omit
extend locals properly
Merge remote-tracking branch 'origin/master'