Remove astyle binary stuff (does not belong to src repo)
Merge branch 'master' into diversity