fix make js so user-defined places work if environment=='prod'
Merge branch 'master' of github.com:straup/privatesquare into trips

Conflicts:
	CHANGES.md