Use git describe --first-parent for version

This should help disambiguate branches, but still needs a new tag on
master.
Don't bother rounding frames to 10 seconds

It's not the new i-frame interval and wasn't really the old one either
moved resumable files
Merge branch 'master' into resumable