Fix term names to use IDs rather than names

Commit 567eeb85f85d19e11011e8551882790af7c29fab fixed term names to use
the IDs of the images, since two different images can have the same name
but different id. This commit reintroduces this change, along with minor
style modifications.
Add user data extension.
Merge pull request #1 from alvarolopez/fix_term_names

Fix term names to use IDs rather than names
Merge pull request #2 from alvarolopez/use_instance_types_rather_than_flavors

Use instance_types rather than flavors.
Merge pull request #3 from alvarolopez/fix_security_groups

Pass the project_id as a kwarg to the API.
Merge remote-tracking branch 'aloga/master' into occi_user_data
Merge pull request #4 from enolfc/occi_user_data

Occi user data
Changed references from grizzly to havana.
Move from instance_types to flavors.
Corrected pychecker command line.
Remove PEP8 warnings.
Fixed handling of security group.
Removed pycheck warning.
Removed warnings, fixed deletion (needed a proper
object instead of a dict)
Removed warnings.
Fixed testing. Commented out the password change.
Merge branch 'fix-tests' into stable/havana
Starting working on user_data tests.
merge