also convert md to rst when just updating pypi
Merge remote-tracking branch 'origin/master'
updated flash part of jPlayer to version 2.7.0 fixes #498
Merge commit 'cfbe6dc'