Tweak gemfiles and tavis.yml