From #1148
* Merge and improve uuid module * Move uuid into 2and3 * Fix mistyped things, add compare operators