More stuff that got dropped by .gitignore
Merge branch 'bundle-ffmpeg' of github.com:stepmania/stepmania into bundle-ffmpeg