automatically updated dependencies
update all dependencies again
Remove Pony conflict in tests
Merge pull request #221 from theodi/update-dependencies-2014-01-01

automatically updated dependencies