Refactoring parseconfig make clearer what is happening with options..
PM Removing need for keypairs in samples to allow test deploys