Update CM units to use cn-wordpress shortcode
CN js files are added by the library, don’t include them again
Merge branch 'master' of git://github.com/CondeNast/pangea