Stray comma
Updated information for Flowplayer installation
Update README.markdown
Update README.markdown
Update README.markdown
Updating readme
Merge branch 'master' of https://github.com/ccnmtl/mediathread

Conflicts:
	README.markdown
readme
tweak
* Tweak for All Class Members / Full Collection View / No Assets
* Setting up for more configurable Flowplayer
Setting up for more configurable flowplayer
Configurable flowplayer versions
Tweak to project export urls to include trailing slash
adjusting a thumbnail url
Django 1.4.7
staging context configuration.
use jenkins rather than test
* courseaffils upgrade to resolve the password hashers bug
* Django 1.4.8 upgrade
Updated information regarding flowplayer configuration
Update README.markdown
About, Email Us & Help were not clickable due to irritating css nonsense.
Updating sherdjs for the JWPlayer bookmarklet bug fix.