Clean up prim
Cut it down to only prim
Merge branch 'master' into gh-pages