Replace spaces in uploaded filenames with hyphens

closes #2485
- use hyphens instead of underscores when santising filenames
- updated tests
Merge pull request #2486 from jaswilli/issue-2485

Replace spaces in uploaded filenames with hyphens