Merge bare.html and base.html

bare.html wasn't used except in base.html – this change simplifies
things by just merging the two.