fixed gemfile lock conflicts
Merge pull request #22 from bobolinks-2014/omdb_parser

fixed gemfile lock conflicts