fixes based on code review recommendations

Previous commits:
--------
finish v2.0 model and minor fix in v1.0 model

add images v2.0 models, unittest and test data

move tests/* into cloudcafe/metatests/ to avoid namespace issues

fleshed out v2.0. model and unittests

Change-Id: I86f339e6a306b44d5c667819ac1af402e86a362b
micro-commit for kao

Change-Id: Idbe2b816a7b2a988d87bffb6900265699067be28