ENH: gl-gloo merge

I went through and merged the two branches as best I could, up to the limit of my knowledge. This only has a couple failing tests. Hopefully @almarklein @rougier you can both take a look and see if you're happy :)

Feel free to open PRs on my branch, or open a PR of your own based off of this.