1.2.0

This is maddness! We've been on this branch for months. Time to merge it all in.