Move JSON tranforms into storage methods (bug 984984)

revert changes to settings.js that got checked in by accident

cleaned up all use of old storage methods, added tests