Merge pull request #105 from coryb/preserve-on-error

add --preserve-on-error global option
prepare for release 1.2.138-dev
Merge branch 'master' of github.com:Netflix/aminator into testing
prepare for release 1.2.139-dev
Merge branch 'testing' of github.com:Netflix/aminator into chef