automatically updated dependencies
Merge pull request #242 from theodi/update-dependencies-2013-05-15

automatically updated dependencies