Fix various findbugs static code analysis suggestions
Merge pull request #120 from trevorbernard/findbugs

Fix various findbugs static code analysis suggestions