a2fe2fbd5e
This merges things up and removes duplicate gemspecs so we can easily make framework gem releases for embedding in 3rd-party projects.