automatically updated dependencies
Merge pull request #413 from theodi/update-dependencies-2014-12-24

Updated dependencies