Updated git ignore
Added vw and license
Changed vw directory in settings
Merge remote-tracking branch 'origin/develop' into develop-newprune