diff --git a/.env.development b/.env.development
index 74aaf42..ad17762 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,6 @@
 RACK_ENV=development
 RAILS_ENV=development
+
 APP_SECRET=fe837ea72667ec3d8ecb94cfba1a1bba
 
 DEPLOY_PATH=/var/www
@@ -20,7 +21,5 @@ MYSQL_CONNECTION_POOL=8
 NEW_RELIC_APP_NAME=ENSL
 NEW_RELIC_LICENSE_KEY=
 
-EXCEPTIONAL_API_KEY=
-
 GOOGLE_API_KEY=
 GOOGLE_CALENDAR_ID=
diff --git a/.env.example b/.env.example
index ad15def..18bb10b 100644
--- a/.env.example
+++ b/.env.example
@@ -1,16 +1,23 @@
+# Read https://github.com/bkeepers/dotenv
+
+# Change this depending where you are
 RACK_ENV=production
 RAILS_ENV=production
+
+# App secret for cookie encryption
 APP_SECRET=randomstringhere
 
+# Since this is inside Docker container, it doesn't really matter
 DEPLOY_PATH=/var/www
 
+# Puma settings
 PUMA_WORKERS=5
 PUMA_MIN_THREADS=1
 PUMA_MAX_THREADS=16
 PUMA_PORT=4000
 PUMA_TIMEOUT=30
 
-# Docker adds mysql to hosts
+# Docker adds mysql name to /etc/hosts
 MYSQL_HOST=mysql
 
 # This is used by both rails + mysql
@@ -19,12 +26,12 @@ MYSQL_DATABASE=ensl
 # Add to allow docker image to connect
 MYSQL_ROOT_HOST=%
 
-# FIXME: Use root since normal user does not work. atm.
-MYSQL_ROOT_PASSWORD=randomstringhere
+# Root MySQL password
+MYSQL_ROOT_PASSWORD=ensl
 
-# These variables are for ensl
-MYSQL_USERNAME=root
-MYSQL_PASSWORD=randomstringhere
+# These are for ENSL, edit at least password
+MYSQL_USERNAME=ensl
+MYSQL_PASSWORD=ensl
 
 # More MySQL vars
 MYSQL_CONNECTION_POOL=32
@@ -36,7 +43,5 @@ TEST_APP_PORT=3005
 NEW_RELIC_APP_NAME=ENSL
 NEW_RELIC_LICENSE_KEY=
 
-EXCEPTIONAL_API_KEY
-
 GOOGLE_API_KEY=
 GOOGLE_CALENDAR_ID=
diff --git a/.env.test b/.env.test
index afce064..2cfc21a 100644
--- a/.env.test
+++ b/.env.test
@@ -1,5 +1,6 @@
 RACK_ENV=test
 RAILS_ENV=test
+
 APP_SECRET=fe837ea72667ec3d8ecb94cfba1a1bba
 
 DEPLOY_PATH=/var/www
@@ -24,8 +25,6 @@ MYSQL_CONNECTION_POOL=8
 NEW_RELIC_APP_NAME=ENSL
 NEW_RELIC_LICENSE_KEY=
 
-EXCEPTIONAL_API_KEY=
-
 # Fix poltergeist issue
 CLIVER_NO_VERIFY=1
 OPENSSL_CONF=/etc/ssl/
diff --git a/.gitignore b/.gitignore
index edf8380..9117fa9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 .ruby-version
 .ruby-gemset
 .env
+.env*.local
 .tmp*
 .rspec
 .sass-cache