Merge pull request #292 from bmjen/release-prep-1.2.1
Updates CHANGELOG and metadata for 1.2.1 release