cs27x/team2 — pull request #14 by evcrowe (2014-09-25 08:47:21+00:00)
Title: Make sure location stuff is merged in

I think I already took this into account somehow, but need to make sure.