Switch to cleaner RVM setup and use bundler for gems