Fix json encoding so results, features do not default to unpickleable
Merge pull request #735 from demaagdk/develop

Fix json encoding so results, features do not default to unpickleable