rspec passes, some gems added
update for Carmen gem
merge develop into jb-update-rails. resolve conflicts