cleanup
Merge branch 'refactor' of https://github.com/NICTA/nationalmap into refactor