Merge branch 'rails_4.0_upgrade' of github.com:Quoin/RapidFTR into rails_4.0_upgrade
Merge branch 'rails_4.0_upgrade' of github.com:Quoin/RapidFTR into rails_4.0_upgrade
Fix to cucumber error:  Expecting an array or keyed hash for property User#role_ids (RuntimeError)
Merge pull request #21 from jtoliver/rails_4.0_upgrade

Rails 4.0 upgrade
Removed vestiges of the couchrest_rails style of setting the database suffix and prefix. Corrected the generator for couchdb.yml.
Merge pull request #22 from pnabutovsky/rails_4.0_upgrade

Removed vestiges of the couchrest_rails style of setting the database su...
Mods to fix failing cucumber tests
Merge branch 'rails_4.0_upgrade' of https://github.com/quoin/RapidFTR into rails_4.0_upgrade