update depedencies in a way that does not choke travis-cl

I'm sorry but the other PR's quickly became a mess. I'm collecting all of them in this PR and making sure it passes travis-ci.

1) Update dependencies