Merge everything to be current with CM

* Well..... minus the thigns we don't want!

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>