Set version to 2.1.0

Remove unreleased section of CHANGELOG

Prep for 2.0.1 release + resolve merge conflicts

Add CHANGELOG to Yard output and tweak formatting

Remove VERSION file from gemspec

Fix packaging error

Resolve conflicts merging master into stable

Resolve merge conflicts

Nodoc another security method

Resolve merge conflicts