Updated dev.ini and setup.py for pyramid 1.4.1
Merge branch 'master' of github.com:sdholbs/swoll