fixed spec, updated gemfile, more cleanup
Got a lot of rspec things fixed
Doing a lot of cleanup work