Reset to CM

Too many commits, so little time... my apoligies to all that
contributed,
including intervigil, toastcfh, and h8rift.

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