updated settings to use local by default
adding @aldarund to contributors
Merge branch 'master' of github.com:agiliq/merchant