pyramid 1.5 compatibility
Merge pull request #140 from strobelm/pyramid15

pyramid 1.5 compatibility