Update to work on ubuntu, and added bundler support