commenting out hbb and hmm for now
Merge remote-tracking branch 'upstream/master'
Merge pull request #53 from ffrensch/master

commenting out of hbb and hmm