Upgrade pyramid to 1.5
Merge pull request #1000 from tonio/pyramid_15

Upgrade pyramid to 1.5