Merge pull request #27 from EGI-FCTF/stable/essex

Stable/essex
added note on puppet and occi