Update README.md
Merge pull request #57 from tmetsch/use_instance_types_rather_than_flavors

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

Pass the project_id as a kwarg to the API.
merge
fixes #62
fixed security rule hanlding & code cleanup
fixes #66 #67
minor fix for #66
Merge branch 'stable/havana' of https://github.com/enolfc/occi-os

Conflicts:
	occi_os_api/nova_glue/vm.py
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
note about move to stackforge