cleanup gemfile; tweak config