Working on new naming convention.
Working on new naming convention.
unittests tuned for grizzly
all tests now run on grizzly - minimized the itnerface between OS and OCCI - TODOs need to be fixed
all tests now run on grizzly - minimized the itnerface between OS and OCCI - TODOs need to be fixed
Pass the project_id as a kwarg to the API.

Fixes SecurityGroupNotFoundForProject exception.
Load flavor from instance_types rather than nova.compute to work with Grizzly.
Merge pull request #55 from 100PercentIT/master

Load flavor from instance_types rather than nova.compute to work with Grizzly.
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.
Use instance_types rather than flavors.
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 branch 'master' into stable/grizzly

Conflicts:
	README.md
Merge remote-tracking branch 'aloga/master' into occi_user_data
Merge pull request #4 from enolfc/occi_user_data

Occi user data
Merge commit '57f6b7926eeb08a4a490ee86afef23d1b462a4a8' into stable/grizzly