Fix merge issues
Main application builds. Tests fail. Now for the tests
Tests now pass - wow setting them up is hard
Some build instructions and build simplification
Some prep for publising to maven central