Mp/consolidate chef wm

Ping @opscode/server-team 

This is a WIP consolidation that combines oc_chef_wm and chef_wm into oc_chef_wm. 

Note that because I'm preserving history of the original content out of chef_wm, we have a lot of noise in this branch. To see the actual changes made (beyond simple moving of files), your best bet is  to look at the indvidual recent commits data today and later .