pulled in latest changes, incl. bootstrap theme submodule