automatically updated dependencies
Merge pull request #301 from theodi/update-dependencies-2013-11-20

automatically updated dependencies