Install Cucumber and action mailer testing gems
Updated gemfile
Fix merge conflicts