Merge pull request #22 from jabranr/master

Fix quite a few issues
Merge pull request #23 from jabranr/master

add combined data from pk-census and pk-districts. fix issue #19