more jackson
Merge branch 'route-cleanup' of github.com:lumifyio/lumify into route-cleanup