Refactor and comment scaffold.coffee
Merge branch 'master' into feature-errors