improve Makefile
adapt for hipchat webhook
shuffling checks
refactoring