Update 'ls' aliases.
Delete obsolete NERDTree settings.
Merge branch 'develop'