At this point, it might be better to merge the OAE `bootstrap3` branch into master and work from that. That will no longer require you to include bootstrap yourself