More work on diesel
Merge branch 'master' of github.com:okennedy/jitd