Make some changes to support Ruby 2.1
Merge pull request #1 from gjtorikian/remove-iconv-for-ruby2.1

Make some changes to support Ruby 2.1