MASSIVE PULL REQUEST

If you guys have ten minutes, could we walk through this super quickly tomorrow?  
It's a lot of stuff, but it benefits us all!