Cleanup; integrating handy Guava classes
Merge branch 'experimental' of https://github.com/ku-fpg/armatus.git into experimental