Disable nerdtree auto startup
New strip trailing whitespace function
Merge branch 'develop'

* develop:
  New strip trailing whitespace function
  Disable nerdtree auto startup