Use bundler and aqueductron and rspec gems
Remove rspec deprecations
Make code use aqueductron