* attempt to fix travis

* fix some issues

* other fixes

* fix builds

* affect tests?

* add patch

* update bundle

* fix dependencies

* update version