Refactoring in progress: use ContentProvider.

Broke support for < honeycomb, will need to fix later. Also needs a code
cleanup and reorganization (inconsistent get("wine") vs
get(WineContentProvider.__).
Revamped the db/content provider - still buggy.
Change "Wine" object to be closer to Database.

Also fix the way we handle intents (always pass the id of the wine,
they'll figure out what it is).
Merge branches 'content' and 'master'