Added markdown parsing stuff, and other bits and pieces