clang cleanup
Merge branch 'master' of github.com:DerOrfa/isis