add some markdown input stuff
Merge branch 'sean' into keith