Merge branch 'master' into development: changes for 0.5.3.

Conflicts:
	TODO.md

1 files changed, 6 insertions, 2 deletions

diff --git a/TODO.md b/TODO.md
index 94635f5..f877869 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,12 +3,16 @@ TODO
 
 In development branch:
 
+* Figure out a way to suppress center alignment of images in reST output.
+* Add a unit test for the change made in 7ea8e7180c41.  This is with regard
+  to not requiring spec tests when running tests from a downloaded sdist.
 * End support for Python 2.4.
 * Add Python 3.3 to tox file (after deprecating 2.4).
-* Turn the benchmarking script at pystache/tests/benchmark.py into a command in pystache/commands, or
-  make it a subcommand of one of the existing commands (i.e. using a command argument).
 * Look into bypassing the _PartialNode class so that partials can be loaded
   and parsed at parse-time instead of at render-time.
+* Turn the benchmarking script at pystache/tests/benchmark.py into a command
+  in pystache/commands, or make it a subcommand of one of the existing
+  commands (i.e. using a command argument).
 * Provide support for logging in at least one of the commands.
 * Make sure command parsing to pystache-test doesn't break with Python 2.4 and earlier.
 * Combine pystache-test with the main command.