Fix indentation
Multiple list control fixes

Some depend on fixes in Webtest, including this one:
https://github.com/Pylons/webtest/pull/62