Added paragraph definition to cheatsheet
Reduced margins of cheatsheet
Moved column definitions from template to contents
Merge remote-tracking branch 'upstream/master'