Formatting and include cleanups
Merge branch 'master' of github.com:osmcode/node-osmium