Update changelog for 1.1.1. See #164
Merge branch 'master' into gh-pages