a new world order, change files in place
cope with leading comments
and finally working nicely
Merge pull request #7 from andymckay/new-world-order

New world order