UUID Migration, Fixes and Cleanup, Much Work :/
Merge pull request #221 from net32/master

UUID Migration, Fixes and Cleanup, Much Work :/