Final changes and cleanup for new pref storage
Merge branch 'newPrefStorage' of github.com:jgbishop/colt into newPrefStorage