app.js streamlining
Merging origin/dchasman/master-pending-appjsStreamlining into master