fixed some gems specific to the centos apache server we're using
resolving gemfile conflict
compatibility for mind
Merge branch 'master' of https://github.com/mabstorm/db_editor_ror
merging for mind