Merge pull request #162 from coryb/testing

fix merge issues when merged in from master branch
prepare for release 2.0.218-dev
prepare for release 2.0.219-dev
prepare for release 2.0.220-dev
Merge branch 'testing' of github.com:Netflix/aminator into testing