Enough cleanup to remove underscore.js
Merge branch 'feature/coffee' into develop