Changes to allow slave to build on linux
Merge branch 'master' of https://github.com/charliehorse55/esb