Merge pull request #688 from mcmonkey4eva/master

Pull request for arbitration and anti-arbitration
Clean location.find.surface_blocks

Don't misuse location objects, don't count air blocks, don't throw
comparison errors, ...