[trunk] Abstract the key to the LocationMap so objects can be used to identify locations rather than general strings
[trunk] Fixing line endings
[trunk] Adding Python script to convert line endings to Unix style