Support passthrough of additional ConfigurationOptionSettings.
Merge branch 'master' into pr/31

Conflicts:
	README.md
Fix alias problems with terminate.
Use alias in cname creation.
Improve option inheritance.

Allow options for AWS options and environment variables
to be inherited from :aws :beanstalk for each environment.