Fix typo in setup.py
initial documentation - note this is not current and needs to be updated
Update occi.md

added precautionary note
Fix typo from merge.
Merge pull request #46 from alvarolopez/stable/folsom

Fix typo from merge.
first shot on issue #28.
Merge remote-tracking branch 'origin/stable/folsom' into stable/folsom
first shot on issue #28.
second shot on issue #28.
fixing unittests step 1/?.
fixing unittests step 2/?.
fixing unittests step 3/?.
tests for #28.
pep8 compliance cleanup.
moving on to grizzly
Should fix #47.
Merge branch 'stable/folsom' of github.com:tmetsch/occi-os into stable/grizzly
Update README.md
Working on new naming convention.
Working on new naming convention.