nb specific ignore for user specific settings
remove user specific nb settings
Merge remote-tracking branch 'origin/dev' into dev