reluctantly give up on jython
Merge branch '1.0-branch' of github.com:Pylons/pyramid into 1.0-branch