Misc cleanup; Added concatenated app.js