Merge branch 'master' into develop

Bookkeeping
Clean up README a little for github.

Sadly, github understands markdown but not multimarkdown, so I have
to ditch the meta-data at the top...
Merge branch 'develop'

Damnit, must update master branch on git to have things look right by
default...