New UPTR wrapper

* Move to Java 7
* Sync with rest of Nuthatch
Clean up and sort