# Conflicts:
#	README.rst
#	setup.py
#	template/filters.py
#	tests.sh

- Added JMESPath support, updated docs, TODO list accordingly.
- Added docs to the locally run Tox environments (otherwise when I run
Tox locally this test won't be performed).

- Allow Python 3.2 to fail again (Jinja doesn't test on Python 3.2 so there may be no recurse but to remove testing on Python 3.2).

- Created a new Tox environment just for docs, added said environment to Travis CI, reintroduced Python 3.2 tests.

Unicode strings.
- Fixed combine filter tests.
- Updated TODO list accordingly.

- Consistent indentation in .travis.yml.

- Updated TODO list.

# Conflicts:
#	README.rst
#	tests.sh