Changing wordcount to use a Counter instead of dict
Misc code cleanup
Merge remote-tracking branch 'origin/destpassing' into destpassing

Conflicts:
	inclib.py
Renaming test + adding skipping for breaking test
Adding measurement module for experiments
Adding tests for measurement module