slight changes to naming schema - following burton's suggestions - also restored broken fixie logging which seemed to be overwritten by someone elses commit
Merge branch 'master' of https://github.com/csvsoundsystem/fms_parser