exclude readme, too many conflicts
Merge branch 'lokifer-master'
readme 2008
readme typo
Merge branch 'master' of github.com:nrkn/nz-data