Updating dependencies and fixing travis-ci issues