reorganize dependencies (Bundler oriented)

Also, try out Travis containers (even though osx is listed)