Merge with branch ged/ac_config_headers
Update gemfile to use secure rubygems and version of spec