Simplify a bit
Update bundler config