updated settings jar for intellij
Merge branch 'master' of github.com:nickv82/dots