Finished introducing use of bootstrap, expanded markdown-to-template matching