fully qualify config/aws.yml access; prefer our aws tools over $PATH
override aws variables
Merge commit 'HEAD@{1}'

Conflicts:
	libexec/_awsme