Updated to the latest bundler/gem specs and cleaned up and updated the code