Merge pull request #1 from starpeak/master

Shinken monitoring
Merge branch 'master' of https://github.com/cloudmodel/cloudmodel