rename djbootstrap->bootstrap
merge