Add jbuilder stuff
Merge fm Jed