Next release

Getting a bunch of stuff that had built up merged into master.