Separate 'dev' from 'dev-ssh'.
Merge branch 'master' of github.com:mozilla-services/heka-build