Simplify equals() and compareTo().
Merge pull request #1 from Bombe/location-as-object

Simplify equals() and compareTo().