Fix specs under Ruby 1.9
Make the encoding check a no-op on Ruby 2.0
Merge branch 'master' of https://github.com/bbatsov/rubocop
pulled from origin
tagged grammar_spec