Merge branch 'develop'
spped up travis.ci.
update dependencies.