Fix some broken markup from bikeshed conversion

Generated from:

commit 34c53e3cd0d2957c4ebc37d9bc7ce7cc9840bc2c
Author: Brian Birtles <birtles@gmail.com>
Date:   Wed Oct 29 11:34:00 2014 -0700

    Fix some broken markup from bikeshed conversion

commit 508a778aaa722104fea681b8a7a2a7930ba6b1ef
Author: Brian Birtles <birtles@gmail.com>
Date:   Wed Oct 29 11:33:14 2014 -0700

    Fix some bugs introduced by bikeshed