Fixes to parseLocations.
Missed two keywords.
More comments.
Merge pull request #57 from rhuang/fix-locations-filter

Fixes to parseLocations.