Merge pull request #240 from BU-CS673/Canfield-Staging

Canfield-Staging -> Canfield
Fixed some instances of resources being held on to
FindBugs fix
Merge pull request #276 from BU-CS673/Canfield

Canfield -> Canfield-Staging