Revert "dumbed down locations for prototype, just pass in a list of location names now"

This reverts commit e4f08f8196ec6b6216dc5f7ac13cc7da8b99043f.
Revert "Changed some field names"

This reverts commit 0b1a40b6ab62fad00b5b84182391477b6e553032.
Revert "Merge branch 'master' of https://github.com/isaaclimdc/EatUpServer"

This reverts commit f23249120ea7f569f65cff68bfa26ffb86132f54, reversing
changes made to e4f08f8196ec6b6216dc5f7ac13cc7da8b99043f.