changed parsing stuff, work in progress
Merge branch 'akron/noctrl-cli' of github.com:flowgrammable/freeflow into akron/noctrl-cli