More formatting fixes #14

Change generic marker to use braces which don't upset markdown.