Fix formatting of includes and lists
Merge pull request #2 from z00b/formatting

Fix formatting of includes and lists