automatically updated dependencies
Merge pull request #305 from theodi/update-dependencies-2013-12-04

automatically updated dependencies