removed old leftovers
Merge branch 'master' into myblog
minor update to doctype