Pull out Wazi-specific views, revert most of views.py.

There are only one or two changes left in views.py that
are wazi-specific.
Return country as a search result