update for master to include nerdtree, scala, sensible