Flattening more.
Merge branch 'master' of github.com:dpinney/omf