diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30a1369..a51fcbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,26 @@
 # Changelog
 
+## 2.1.0 (1/27/18)
+
+* Upgrades Bootstrap from v4 beta to v4.0.0
+* Replaces deprecated eslint JSX spacing rule, fixes linting across the project
+
 ## 2.0.0 (1/31/2017) :tada:
 
 Many of the core libraries and tools have had major releases, as they should, so this major release is to account for any breaking changes they've introduced. Most of the breakage occured with the Bootstrap upgrade from alpha to beta 3, but Bootstrap 4 should remain much more stable from beta to release. The rest of the updates were relatively painless. Hello React 16!
 
 Major changes:
 
-- React 15 -> React 16
-- Webpack 2 -> Webpack 3
-- Bootstrap 4 alpha -> Bootstrap 4 beta
-- Implements Jest more fully with new lint rules and supporting dependencies
-- Upgrade TravisCI's Node environment from 6 to 8
-- All other dependencies upgraded, some including major version bumps
-- various refactors and cleanup
+* React 15 -> React 16
+* Webpack 2 -> Webpack 3
+* Bootstrap 4 alpha -> Bootstrap 4 beta
+* Implements Jest more fully with new lint rules and supporting dependencies
+* Upgrade TravisCI's Node environment from 6 to 8
+* All other dependencies upgraded, some including major version bumps
+* various refactors and cleanup
 
 ## 1.0.0 (05/19/2017)
 
 This marks the first release of the boilerplate! :tada:
 
-Proper documentation is forthcoming, but everything is working as it should for the first release. Please kick the tires and run this off-road. If you find any problems or errors off the bat, please open an issue.
\ No newline at end of file
+Proper documentation is forthcoming, but everything is working as it should for the first release. Please kick the tires and run this off-road. If you find any problems or errors off the bat, please open an issue.
diff --git a/package.json b/package.json
index becdab0..1ca9956 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
 {
   "name": "react-ssr-boilerplate",
-  "version": "2.0.0",
-  "description": "A minimalistic boilerplate with everything you need to get a server side rendered React application up and running FAST.",
+  "version": "2.1.0",
+  "description":
+    "A minimalistic boilerplate with everything you need to get a server side rendered React application up and running FAST.",
   "main": "index.js",
   "author": "Matt Trifilo",
   "license": "MIT",
@@ -10,22 +11,30 @@
     "test": "NODE_ENV=test jest",
     "tdd": "yarn run test --watch",
     "coverage": "yarn run test --coverage",
-    "lint": "eslint server.js webpack.config.js webpack.prod.js server/** client/**",
+    "lint":
+      "eslint server.js webpack.config.js webpack.prod.js server/** client/**",
     "prettier": "prettier-standard 'server/**/*.js' 'client/**/*.js'",
     "build": "webpack",
     "watch": "webpack --watch",
     "build:prod": "yarn run babel:prod && webpack --config webpack.prod.js",
     "watch:prod": "webpack --config webpack.prod.js --watch",
-    "babel:prod": "yarn run babel:clear && mkdir public/production && yarn run babel:components && yarn run babel:redux && yarn run babel:auth && yarn run babel:validation",
+    "babel:prod":
+      "yarn run babel:clear && mkdir public/production && yarn run babel:components && yarn run babel:redux && yarn run babel:auth && yarn run babel:validation",
     "babel:clear": "del public/production",
-    "babel:components": "NODE_ENV=server babel client/components -d public/production/client/components",
-    "babel:redux": "NODE_ENV=server babel client/redux -d public/production/client/redux",
-    "babel:auth": "NODE_ENV=server babel client/auth -d public/production/client/auth",
-    "babel:validation": "NODE_ENV=server babel server/validation -d public/production/server/validation",
+    "babel:components":
+      "NODE_ENV=server babel client/components -d public/production/client/components",
+    "babel:redux":
+      "NODE_ENV=server babel client/redux -d public/production/client/redux",
+    "babel:auth":
+      "NODE_ENV=server babel client/auth -d public/production/client/auth",
+    "babel:validation":
+      "NODE_ENV=server babel server/validation -d public/production/server/validation",
     "server": "NODE_ENV=server nodemon server.js",
     "mongo": "mongod --port 27017 --dbpath=./data",
-    "compile-routes": "NODE_ENV=server babel client/components/Router/Routes.js -o client/components/Router/CompiledRoutes.js",
-    "all": "xfce4-terminal -H -e \"yarn run tdd\" & xfce4-terminal -H -e \"yarn run watch\" & xfce4-terminal -H -e \"yarn run server\" & xfce4-terminal -H -e \"yarn run mongo\""
+    "compile-routes":
+      "NODE_ENV=server babel client/components/Router/Routes.js -o client/components/Router/CompiledRoutes.js",
+    "all":
+      "xfce4-terminal -H -e \"yarn run tdd\" & xfce4-terminal -H -e \"yarn run watch\" & xfce4-terminal -H -e \"yarn run server\" & xfce4-terminal -H -e \"yarn run mongo\""
   },
   "dependencies": {
     "axios": "^0.17.1",