Re-evaluate options after particular points to ensure that we can accurately determine where the options came from.
Removed the re-evaluation of the options on the environment variables as it's done internally when setting the environment variables
Updated environment variable constant to be consistent with other sources description
Merge pull request #140 from pgermishuys/dev

Re-Evaluate the options for dumping