removing flowplayer stuff
Merge branch 'master' of https://github.com/workatplay/drupalcon-2013