modify environment configuration files to be more consistent; update gemfile