Merge branch 'master' into configobj

Conflicts:
	setup.py

diff --cc setup.py
index 37144b5be01aa05376aefe16945246cb50f58db3,ae5394eb033e388800d6dba14534af7ac3e49ef4..1ca1242663c06319b1c567914c742ad945bfa3cc
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -42,7 -42,7 +42,8 @@@ setup
          'translitcodec',
          'argparse',
          'webtest',
 +        'ConfigObj',
+         'lxml',
          ],
      test_suite='nose.collector',