Streamlined argv[], so it can be changed around more easily.
Merge pull request #192 from arstrube/argv

Streamlined argv[], so it can be changed around more easily.