Fix master branch

Looks like we had a bad merge a few weeks ago on the master branch (around Apr 13), and most of the code to support c* 1.2 was stomped over with 1.1 code (the priam 1.1 branch was incorrectly merged up to master).This patch corrrects that merge, and fixes a few minor things that fell out of the merge.

Thanks to Arya Goudarzi for pointing this out.