Reorganize Gemfile, update README

End of section 3.6.1