Finish cleanup. On to SCDL editting.
Merge branch 'master' of github.com:Encapsule/schema