automatically updated dependencies
Fix time-dependent test
Merge pull request #326 from theodi/update-dependencies-2014-01-15

automatically updated dependencies