Add words
Add ffmpeg helper
Add date vim snippet
Merge branch 'master' into chewbacca