changes to location lib
Merge branch 'master' of https://github.com/justinberry/spaceapps2013

Conflicts:
	app.yaml
added test