Fixed #33 untapped search

Deleted and changed models to match data from Untappd.
Changed templates to match new models.