merge pull request from: https://github.com/daithi-coombes/logsearch-flowdock-bot/pull/1
Merge pull request #10 from cityindex/daithi-coombes-setup-jenkins

fix conflicts in pull #9