Fixed typo

'ore' > 'or'
Fixed typos: overriden to overridden
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 pull request #202 from Necoro/master

Fix vim syntax: filters
Whitespace cleanup
Merge pull request #206 from johnmcdonnell/wordwrap

Allow choice of wrap string in wordwrap filter.
Merge branch 'master' of github.com:mitsuhiko/jinja2
Added missing versionadded and changelog entry
Merge pull request #188 from lemonad/master

Fixed typos: overriden to overridden
Merge pull request #163 from kuyan/patch-1

Fixed typo
Add Travis CI
Merge pull request #219 from sharoonthomas/master

Add Travis CI for master