Adding generic options under new name
committing changes to substitute.pl locally for use on the AWS
resolving merge