Cleanup tests for nicer command line running and make it so that Maven should build a single fat JAR
Update README