canonicalize include file ordering

add Peter's coding style
Merge pull request #18 from regehr/include-cleanup

code style stuff