Merge branch 'release/1.2.0'

* release/1.2.0:
  Adding changelog entries to reflect 1.2.0's new stuff.
  Bumping version number. (1.2.0)
Merge branch 'master' into develop

* master:
Version bump!
Updating changelog.
Merge branch 'release/1.2.1' into develop

* release/1.2.1:
  Updating changelog.
  Version bump!