Fixed a number of memory leaks
Removed extra getType method implementations for contact calculators
Merge remote-tracking branch 'origin/master'