Modified __unicode__(self) functions to return correct site and observation names