Merge branch 'hotfix/update_nb' into develop
Merge branch 'master' of https://github.com/wildcloud3/vim-settings