Update uncrustify binary; Add new option to definitions
Merge branch 'master' of github.com:ryanmaxwell/UncrustifyX