Revert "Merge branch 'master' of https://github.com/naparuba/shinken"

This reverts commit c226fe9bf5fca5e116e0cc8bf364fc0e24bdb106, reversing
changes made to cd294bb459f5d1a6add68671a9e080b326df5a2e.