Update dependencies
Merge pull request #1 from eirikref/update-dependencies

Merge after passing Travis.