Merge branch 'master' of github.com:hippysurfer/pyosm
Merge branch 'master' of github.com:hippysurfer/pyosm
various developments