Merge pull request #27 from evoskuil/develop

Sort includes IAW style, various other housekeeping.