Merge pull request #1 from aarondav/external

Minor cleanup for Scala style
New minor edits
SamplingSizeTracker + Map + test suite