Use jshint linting
Show current dir in PS1, set git conflictstyle to diff3