ffmpeg screencast converter
Merge branch 'master' of https://github.com/parente/dockerfiles

* 'master' of https://github.com/parente/dockerfiles:
  Bare bones ipy for Cloud Foundry Docker support tests