Change output filename to include original extension

Fixes #201

I prefer this method of naming files, but it's not backwards-compatible.

We might consider turning this into a command-line option instead of the default. Thoughts?