Fixed typo

'ore' > 'or'
Fixed typos: overriden to overridden
- Testcase
- Allow callable classes to have contextfunction and the like
Fix vim syntax: Correctly highlight filters.

`skipwhite` makes only sense in combination with `nextgroup`.
Now filters are correctly highlighted independent of spaces after the
'|'.
Allow choice of wrap string in wordwrap filter.
Fixed improperly closed tag in menu example in tricks.rst
Merge pull request #207 from ekalinin/patch-1

Fixed improperly closed tag in menu example in tricks.rst
Merge pull request #200 from Naddiseo/callable_class_contextfunction

Callable class contextfunction, closes #180
Cleanup and changelog entry for new contextfunction behavior
Merge branch 'master' into sprint-branch
Merge pull request #202 from Necoro/master

Fix vim syntax: filters
Merge branch 'master' into sprint-branch
BytesIO from six.
Python 2.6+ supports conditional expressions.
Whitespace cleanup
Merge pull request #216 from Lukasa/luk-sprint-branch

Sprint: Not supporting Python 2.4 is a blessing
Merge branch 'master' into sprint-branch
Merge branch 'sprint-branch' of github.com:mitsuhiko/jinja2 into sprint-branch
Merge pull request #206 from johnmcdonnell/wordwrap

Allow choice of wrap string in wordwrap filter.