Build: update package.json and changelog for v2.1.0

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v2.1.0 (2017-05-16)
+
+* Merge with eslint-plugin-prettify ([#21]([email protected]:prettier/eslint-plugin-prettier/issues/21)) ([6de494f]([email protected]:prettier/eslint-plugin-prettier/commit/6de494fd685a107f3a9a371e663a1f8d68d6d31f))
+* Docs: update repo links to new URL ([#18]([email protected]:prettier/eslint-plugin-prettier/issues/18)) ([6b69492]([email protected]:prettier/eslint-plugin-prettier/commit/6b694928e6e6c192dcb06e6287272fb40cbad17d))
+* Chore: Upgrade development dependencies ([#16]([email protected]:prettier/eslint-plugin-prettier/issues/16)) ([12984ea]([email protected]:prettier/eslint-plugin-prettier/commit/12984ead6c46156b25607c9a8b03ae17def7ef9e))
+* Docs: fix outdated info about prettier's semicolon support ([da6aad1]([email protected]:prettier/eslint-plugin-prettier/commit/da6aad15ea22aa899b26b5ce0979f4a945d80319))
+* Docs: update prettier options in example ([#14]([email protected]:prettier/eslint-plugin-prettier/issues/14)) ([0ae173f]([email protected]:prettier/eslint-plugin-prettier/commit/0ae173f2731b02c0ed72a6cb49efdbdcff54a419))
+* Docs: Change the order of dependencies install ([#13]([email protected]:prettier/eslint-plugin-prettier/issues/13)) ([cbf803c]([email protected]:prettier/eslint-plugin-prettier/commit/cbf803ccf0add6e324ae1513b5260e31bf9a3c05))
+* Docs: Add CONTRIBUTING.md (fixes [#9]([email protected]:prettier/eslint-plugin-prettier/issues/9)) ([40fe55b]([email protected]:prettier/eslint-plugin-prettier/commit/40fe55b3d8c000787b0dcbfa0aed4f0d930808a9))
+
 ## v2.0.1 (2017-02-26)
 
 * Docs: add travis badge to README.md ([1daa495](https://github.com/not-an-aardvark/eslint-plugin-prettier/commit/1daa49558a7f904f8d307d3d434a9bc80f41fee6))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-prettier",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Runs prettier as an eslint rule",
   "keywords": [
     "eslint",