Merge branch 'master' of github.com:yelkurdi/dotvim
Modify astyle options