Map blockyness merge

This is the branch we should merge. It fixes the merge conflicts with map_blockyness and master, and I added a little bit of port balancing too.