fixing issues presented to my tweaks by the 0.9 upgrade
another fix for 09 upgrade
Fixing markdown versus html view
Merge branch 'dev_imgrotation' into 09upgradefix
Fix merge issues
Fix merge issues