More extensive use of Jekyll Liquid and Variables

[skip ci]