added ordering of blocks by manhattan dist
Merge branch 'master' of https://github.com/raywu22/ShireAWAP