Correct Gemfile to Aaron1011's original to fix #16
Remove openssl-nonblock from Gemfile to fix #16
Merge branch 'master' into add_json