Merging to master

Hopefully we'll have everything in the master after this.