0.1.0 -> 0.1.1
travis: add 2.0.0
Gemfile: add iconv gem
Merge remote-tracking branch 'github/master'