Refactored provider creds discovery to be more DRY, added alternate AWS vars.
Merge pull request #309 from opdemand/276-providers-discover-refactor

Fixed #276, #293 -- refactored provider creds discovery