general: brinup to CM

As of 3/11/13
Too many commits, too little time :P

Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>