more linting + weird fix with view.jade
Merge branch 'master' into salesforce