changed location_controller to need a user id in all cases.  Set a current_user in the site_controller (hard coded to 1).  Need to fix that later to be from the session. Charles did most of this.