automatically updated dependencies
Merge pull request #168 from theodi/update-dependencies-2014-12-17

Updated dependencies