Added optional command-line to specify input/output

Also cleared out some trailing whitespace :)
Merge pull request #8 from copumpkin/custom-parameters

Added optional command-line to specify input/output