added capybara gem back to Gemfile, updated specs to pass but they need an overhaul
Merge branch 'master' of https://github.com/orieken/derp-bear