<commit_before>GIT
  remote: git://github.com/felafelwaffle/supermodel.git
  revision: 9e35a026efd55e890717bcda0a6bf7d81d2c38ba
  specs:
    supermodel (0.1.7)
      activemodel (>= 3.0.0)

GEM
  remote: http://rubygems.org/
  specs:
    POpen4 (0.1.4)
      Platform (>= 0.4.0)
      open4
    Platform (0.4.0)
    actionmailer (3.2.11)
      actionpack (= 3.2.11)
      mail (~> 2.4.4)
    actionpack (3.2.11)
      activemodel (= 3.2.11)
      activesupport (= 3.2.11)
      builder (~> 3.0.0)
      erubis (~> 2.7.0)
      journey (~> 1.0.4)
      rack (~> 1.4.0)
      rack-cache (~> 1.2)
      rack-test (~> 0.6.1)
      sprockets (~> 2.2.1)
    activemodel (3.2.11)
      activesupport (= 3.2.11)
      builder (~> 3.0.0)
    activerecord (3.2.11)
      activemodel (= 3.2.11)
      activesupport (= 3.2.11)
      arel (~> 3.0.2)
      tzinfo (~> 0.3.29)
    activerecord-jdbc-adapter (1.3.2)
      activerecord (>= 2.2)
    activerecord-mysql-adapter (0.0.1)
      activerecord (>= 3.2.9)
      activesupport (>= 3.2.9)
      mysql (>= 2.9.0)
    activerecord-oracle_enhanced-adapter (1.4.1)
    activerecord-sqlserver-adapter (3.2.12)
      activerecord (~> 3.2.0)
    activeresource (3.2.11)
      activemodel (= 3.2.11)
      activesupport (= 3.2.11)
    activesupport (3.2.11)
      i18n (~> 0.6)
      multi_json (~> 1.0)
    arel (3.0.2)
    builder (3.0.4)
    coffee-filter (0.1.1)
      coffee-script (>= 2.2.0)
      haml (>= 3.0.18)
    coffee-rails (3.2.1)
      coffee-script (>= 2.2.0)
      railties (~> 3.2.0.beta)
    coffee-script (2.2.0)
      coffee-script-source
      execjs
    coffee-script-source (1.4.0)
    commonjs (0.2.7)
    erubis (2.7.0)
    execjs (1.4.0)
      multi_json (~> 1.0)
    haml (3.1.7)
    hike (1.2.1)
    i18n (0.6.1)
    jdbc-mysql (5.1.25)
    journey (1.0.4)
    jquery-rails (2.1.4)
      railties (>= 3.0, < 5.0)
      thor (>= 0.14, < 2.0)
    json (1.7.6)
    json (1.7.6-java)
    less (2.2.2)
      commonjs (~> 0.2.6)
    less-rails (2.2.6)
      actionpack (>= 3.1)
      less (~> 2.2.0)
    less-rails-bootstrap (2.0.13)
      less-rails (~> 2.2.0)
    libv8 (3.3.10.4)
    mail (2.4.4)
      i18n (>= 0.4.0)
      mime-types (~> 1.16)
      treetop (~> 1.4.8)
    mime-types (1.19)
    multi_json (1.5.0)
    mysql (2.9.1)
    mysql2 (0.3.11)
    nokogiri (1.5.5)
    nokogiri (1.5.5-java)
    nokogiri (1.5.5-x86-mingw32)
    open4 (1.3.0)
    polyglot (0.3.3)
    rack (1.4.4)
    rack-cache (1.2)
      rack (>= 0.4)
    rack-ssl (1.3.2)
      rack
    rack-test (0.6.2)
      rack (>= 1.0)
    rails (3.2.11)
      actionmailer (= 3.2.11)
      actionpack (= 3.2.11)
      activerecord (= 3.2.11)
      activeresource (= 3.2.11)
      activesupport (= 3.2.11)
      bundler (~> 1.0)
      railties (= 3.2.11)
    rails-latex (1.0.11)
      rails (>= 3.0.0)
    rails-settings (1.0.0)
    rails_autolink (1.0.9)
      rails (~> 3.1)
    railties (3.2.11)
      actionpack (= 3.2.11)
      activesupport (= 3.2.11)
      rack-ssl (~> 1.3.2)
      rake (>= 0.8.7)
      rdoc (~> 3.4)
      thor (>= 0.14.6, < 2.0)
    rake (10.0.3)
    rdoc (3.12)
      json (~> 1.4)
    ruby-oci8 (2.1.0)
    scoped_search (2.4.0)
      activerecord (>= 2.1.0)
    sprockets (2.2.2)
      hike (~> 1.2)
      multi_json (~> 1.0)
      rack (~> 1.0)
      tilt (~> 1.1, != 1.3.0)
    sqlite3 (1.3.6)
    symbolize (4.2.0)
    therubyracer (0.10.0)
      libv8 (~> 3.3.10)
    therubyrhino (2.0.2)
      therubyrhino_jar (>= 1.7.3)
    therubyrhino_jar (1.7.4)
    thor (0.16.0)
    tilt (1.3.3)
    tiny_tds (0.5.1)
    treetop (1.4.12)
      polyglot
      polyglot (>= 0.3.1)
    tzinfo (0.3.35)
    uglifier (1.0.3)
      execjs (>= 0.3.0)
      multi_json (>= 1.0.2)
    yui-compressor (0.9.6)
      POpen4 (>= 0.1.4)

PLATFORMS
  java
  ruby
  x86-mingw32

DEPENDENCIES
  activerecord-jdbc-adapter
  activerecord-mysql-adapter
  activerecord-oracle_enhanced-adapter
  activerecord-sqlserver-adapter
  coffee-filter
  coffee-rails (= 3.2.1)
  haml
  jdbc-mysql
  jquery-rails
<<<<<<< HEAD
  less-rails
=======
>>>>>>> parent of 4dda150... Trying stuff for merthyr deploy
  less-rails-bootstrap (= 2.0.13)
  mysql2
  nokogiri
  rails (= 3.2.11)
  rails-latex
  rails-settings
  rails_autolink
  ruby-oci8 (= 2.1.0)
  scoped_search
  sqlite3
  supermodel!
  symbolize<commit_msg>Left merge conflicts in gemfile.lock<commit_after>GIT
  remote: git://github.com/felafelwaffle/supermodel.git
  revision: 9e35a026efd55e890717bcda0a6bf7d81d2c38ba
  specs:
    supermodel (0.1.7)
      activemodel (>= 3.0.0)

GEM
  remote: http://rubygems.org/
  specs:
    POpen4 (0.1.4)
      Platform (>= 0.4.0)
      open4
    Platform (0.4.0)
    actionmailer (3.2.11)
      actionpack (= 3.2.11)
      mail (~> 2.4.4)
    actionpack (3.2.11)
      activemodel (= 3.2.11)
      activesupport (= 3.2.11)
      builder (~> 3.0.0)
      erubis (~> 2.7.0)
      journey (~> 1.0.4)
      rack (~> 1.4.0)
      rack-cache (~> 1.2)
      rack-test (~> 0.6.1)
      sprockets (~> 2.2.1)
    activemodel (3.2.11)
      activesupport (= 3.2.11)
      builder (~> 3.0.0)
    activerecord (3.2.11)
      activemodel (= 3.2.11)
      activesupport (= 3.2.11)
      arel (~> 3.0.2)
      tzinfo (~> 0.3.29)
    activerecord-jdbc-adapter (1.3.2)
      activerecord (>= 2.2)
    activerecord-mysql-adapter (0.0.1)
      activerecord (>= 3.2.9)
      activesupport (>= 3.2.9)
      mysql (>= 2.9.0)
    activerecord-oracle_enhanced-adapter (1.4.1)
    activerecord-sqlserver-adapter (3.2.12)
      activerecord (~> 3.2.0)
    activeresource (3.2.11)
      activemodel (= 3.2.11)
      activesupport (= 3.2.11)
    activesupport (3.2.11)
      i18n (~> 0.6)
      multi_json (~> 1.0)
    arel (3.0.2)
    builder (3.0.4)
    coffee-filter (0.1.1)
      coffee-script (>= 2.2.0)
      haml (>= 3.0.18)
    coffee-rails (3.2.1)
      coffee-script (>= 2.2.0)
      railties (~> 3.2.0.beta)
    coffee-script (2.2.0)
      coffee-script-source
      execjs
    coffee-script-source (1.4.0)
    commonjs (0.2.7)
    erubis (2.7.0)
    execjs (1.4.0)
      multi_json (~> 1.0)
    haml (3.1.7)
    hike (1.2.1)
    i18n (0.6.1)
    jdbc-mysql (5.1.25)
    journey (1.0.4)
    jquery-rails (2.1.4)
      railties (>= 3.0, < 5.0)
      thor (>= 0.14, < 2.0)
    json (1.7.6)
    json (1.7.6-java)
    less (2.2.2)
      commonjs (~> 0.2.6)
    less-rails (2.2.6)
      actionpack (>= 3.1)
      less (~> 2.2.0)
    less-rails-bootstrap (2.0.13)
      less-rails (~> 2.2.0)
    libv8 (3.3.10.4)
    mail (2.4.4)
      i18n (>= 0.4.0)
      mime-types (~> 1.16)
      treetop (~> 1.4.8)
    mime-types (1.19)
    multi_json (1.5.0)
    mysql (2.9.1)
    mysql2 (0.3.11)
    nokogiri (1.5.5)
    nokogiri (1.5.5-java)
    nokogiri (1.5.5-x86-mingw32)
    open4 (1.3.0)
    polyglot (0.3.3)
    rack (1.4.4)
    rack-cache (1.2)
      rack (>= 0.4)
    rack-ssl (1.3.2)
      rack
    rack-test (0.6.2)
      rack (>= 1.0)
    rails (3.2.11)
      actionmailer (= 3.2.11)
      actionpack (= 3.2.11)
      activerecord (= 3.2.11)
      activeresource (= 3.2.11)
      activesupport (= 3.2.11)
      bundler (~> 1.0)
      railties (= 3.2.11)
    rails-latex (1.0.11)
      rails (>= 3.0.0)
    rails-settings (1.0.0)
    rails_autolink (1.0.9)
      rails (~> 3.1)
    railties (3.2.11)
      actionpack (= 3.2.11)
      activesupport (= 3.2.11)
      rack-ssl (~> 1.3.2)
      rake (>= 0.8.7)
      rdoc (~> 3.4)
      thor (>= 0.14.6, < 2.0)
    rake (10.0.3)
    rdoc (3.12)
      json (~> 1.4)
    ruby-oci8 (2.1.0)
    scoped_search (2.4.0)
      activerecord (>= 2.1.0)
    sprockets (2.2.2)
      hike (~> 1.2)
      multi_json (~> 1.0)
      rack (~> 1.0)
      tilt (~> 1.1, != 1.3.0)
    sqlite3 (1.3.6)
    symbolize (4.2.0)
    therubyracer (0.10.0)
      libv8 (~> 3.3.10)
    therubyrhino (2.0.2)
      therubyrhino_jar (>= 1.7.3)
    therubyrhino_jar (1.7.4)
    thor (0.16.0)
    tilt (1.3.3)
    tiny_tds (0.5.1)
    treetop (1.4.12)
      polyglot
      polyglot (>= 0.3.1)
    tzinfo (0.3.35)
    uglifier (1.0.3)
      execjs (>= 0.3.0)
      multi_json (>= 1.0.2)
    yui-compressor (0.9.6)
      POpen4 (>= 0.1.4)

PLATFORMS
  java
  ruby
  x86-mingw32

DEPENDENCIES
  activerecord-jdbc-adapter
  activerecord-mysql-adapter
  activerecord-oracle_enhanced-adapter
  activerecord-sqlserver-adapter
  coffee-filter
  coffee-rails (= 3.2.1)
  haml
  jdbc-mysql
  jquery-rails
  less-rails
  less-rails-bootstrap (= 2.0.13)
  mysql2
  nokogiri
  rails (= 3.2.11)
  rails-latex
  rails-settings
  rails_autolink
  ruby-oci8 (= 2.1.0)
  scoped_search
  sqlite3
  supermodel!
  symbolize
{'fraction_non_alphanumeric': 0.18476367436999186, 'fraction_numerical': 0.12031122982232029, 'mean_word_length': 1.75584, 'pattern_counts': {'":': 0, '<': 16, '<?xml version=': 0, '>': 120, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 2, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '2582609', 'n_tokens_mistral': 4511, 'n_tokens_neox': 4088, 'n_words': 676}