Fix dojo compilation errors
Remove bbop from build since it's not really a proper AMD module
Restore overwritten config.xml