Fix and turn on bundling, fixes #63