gists to ul/li
Minor tweaks
Merge conflicts