Merge pull request #155 from Randgalt/master

Big initial pull for priam-agent
Remove some unused imports
Merge pull request #188 from timiblossom/master

Code cleaning. LGTM, committing
switching to not using guava 12 methods