Rewrote Backbone collection and router stuff. The filtering of locations is now much more efficient.
Merged branches