Change from/toJSON to from/toJS. from/toJSON was ambiguous if it dealt with stringed or parsed JSON. The latter is less confusing. Solves #15