Merge remote branch 'remotes/jwandborg/issue_363'

Conflicts:
	setup.py

diff --cc mediagoblin/user_pages/views.py
Simple merge

diff --cc mediagoblin/util.py
Simple merge

diff --cc setup.py
index cd0e7f0b611d9d7378abec797995259395471205,fb86d6008a6512b03220bfab9336f32079b38a26..2a007f4e44e39fe11f82a34696be2298622c9d23
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -42,10 -42,7 +42,11 @@@ setup
          'translitcodec',
          'argparse',
          'webtest',
 +        'ConfigObj',
+         'Markdown',
 +        ## For now we're expecting that users will install this from
 +        ## their package managers.
 +        # 'lxml',
          ],
      test_suite='nose.collector',