- merged content onto http://www.pylonsproject.org/projects/pyramid/faq
Merge pull request #31 from stevepiercy/master

- merged content onto http://www.pylonsproject.org/projects/pyramid/faq