Rubocop: Fixing/adding glue provider
Rubocop: checking elasticsearch glue model code
Fixing broken elasticsearch tests

Fix tests that broke from fixing the elasticsearch code.
Merge pull request #2890 from daviddavis/temp/20130905093404

Rubocop: Fixing some glue code