Minor cleanups and default to key as id on fields
Merge branch 'master' of github.com:ladderframework/LadderFramework