Improved naming and ordering of parameters

Test folder name is now generated based upon the supplied parameters,
which have been moved to the top of the file. Unused test images have
been removed, and some new, different test images have been added.
Shrunk white.jpg
Fixed input and output directory reference
Returned Egypt to defaults
Merge pull request #9 from marbsydo/develop

Develop