remove yelp config test for now
merge
remove random git stuff
Adding getconfig to package.json
Adding port listener for heroku
removing space, sorry Patrick
Cross origin stuff
Search completed flag
Merge remote-tracking branch 'origin/opendata'
Fixing merge conflicts
incorrect getconfig capitalization
keanan doesn't know how to format json
Adding heroku config stuff
Adding logging
Updating heroku vars
Logging and switching order of env vars
Clean inputs
Fixing url issues
Merge remote-tracking branch 'origin/master'

Conflicts:
	server.js
Fix merge conflicts