Merge branch 'release/0.1.2' into develop
Merge branch 'master' of heroku.com:taxonids into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Random attempt to fix a strange bug on EOL.
Poke.
upgrade ruby version
Added Gemfile.lock.
Explicitly uses JSON now.
Merge branch 'master' of github.com:gaurav/taxonids