String extension to escape filenames
Escape key when used as filename
Fix merge conflic
Merge pull request #37 from hpique/feature/disk-cache/escape-key

Escape invalid key characters for disk image filename. Closes #16.