use PARAMETER_STANDARDIZEDNAME
modularized locations fetch to getLocations()
just doing a little function rearranging.
Merge branch 'master' into lyrical-locations_google-doc

Conflicts:
	app/main.js

rejecting everything from last merge with master.