rel20180420 with very minor differences

Mostly to git files and whatnot.

Code reorg coming so I wanted to tag this correctly.