Fixes issue in flatfile builder, plus new IMs
Merge pull request #5 from g-weatherill/fixes_sept14

Fixes issue in flatfile builder, plus new IMs