clean includes, followed google c++ styleguide
Merge branch 'master' of https://github.com/dorleosterode/gt-scaffold