Merge pull request #289 from theodi/update-dependencies-2014-02-26

automatically updated dependencies
automatically updated dependencies