edits to classifier, fixes to issue #6
Merge branch 'master' of github.com:jewmanchue/wham