Merge pull request #2 from Ashernor/master

Ashernor
Updated Pupperfile.lock
Updated personal config
Updated personal config
Updated config for Dagnan
Update dagnan.pp
Add ffmpeg