more consolidation in HMF
Merge branch 'master' of github.com:davidwhogg/SpectralArchetypes