add ENV and testing w/ rspec
fix GEmfile.lock merge conflicts