merge various things from master

This is a major attempt at joining the two codebases together
better so that it is easier to add joint features. But this
is likely to be the last time I do this.