Release 1.2

I didn't properly feature branch so I'm just going to merge this back in and go from there.