Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'master' of github.com:Pylons/pyramid
fix inclusion of README.rst in the package description
Scaffold template: close an ul tag.

Missing `</ul>` in starter scaffold template.
Scaffold templates: close more ul tags.

Missing  tags in other scaffold templates.
Merge pull request #1359 from george2/patch-1

Scaffold templates: fix missing </ul> tags
Merge branch 'master' of github.com:Pylons/pyramid
- Work around a bug introduced in Python 2.7.7 on Windows where
  ``mimetypes.guess_type`` returns Unicode rather than str for the content
  type, unlike any previous version of Python.  See
  https://github.com/Pylons/pyramid/issues/1360 for more information.

Closes #1360.
Enable automated testing with Python 3.4
Merge pull request #1365 from frewsxcv/patch-1

Enable automated testing with Python 3.4
Merge branch 'master' of github.com:Pylons/pyramid
dont need to use any settings, we include pyramid_jinja2 in main
Correct handler name for logger_wsgi
Fix path to pshell
Merge branch 'master' of github.com:Pylons/pyramid
remove lie
Narrative scifi.
API docs scifi.
Update i18n.rst

To set output file for pot-create -o flag should be used, not redirect.
Merge pull request #1379 from atorkhov/patch-1

Update i18n.rst