dummy commit please ignore
Merge branch 'master' of github.com:pyfarm/pyfarm-agent
Merge branch 'master' of github.com:pyfarm/pyfarm-agent into jobtype_rework