diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 68bd41f7..ffe0d88e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.12.0 2016-06-22
+
+  * Automation support. Create triggers that send a campaign once fired
+  * Fixed an issue with unresolved URL redirects
+  * Added support for relative date ranges in segments
+
 ## 1.11.0 2016-05-31
 
   * Retry transactional mail if failed with soft error (4xx)
diff --git a/config/default.toml b/config/default.toml
index e3a1187b..66aa7fc3 100644
--- a/config/default.toml
+++ b/config/default.toml
@@ -1,13 +1,33 @@
+# This file is the default config file for Mailtrain. To use a environment specific
+# configuration add new file {ENV}.{ext} (eg. "production.toml") to the same folder.
+# {ENV} is defined by NODE_ENV environment variable.
+#
+# Do not modify this file directly, otherwise you might lose your modifications when upgrading
+#
+# You should only define the options you want to change in your additional config file.
+# For example if the only thing you want to change is the port number for the www server
+# then your additional config file should look like this:
+#   # production.toml
+#   [www]
+#   port=80
+# or if you want to use Javascript instead of TOML then the same file could look like this:
+#   // production.js
+#   module.exports = {
+#       www: {
+#           port: 80
+#       }
+#   };
+
+# Process title visible in monitoring logs and process listing
+title="mailtrain"
 
 # If you start out as a root user (eg. if you want to use ports lower than 1000)
 # then you can downgrade the user once all services are up and running
 #user="nobody"
 #group="nogroup"
 
-# Process title visible in monitorin logs and process listing
-title="mailtrain"
-
 [log]
+# silly|verbose|info|http|warn|error|silent
 level="verbose"
 
 [www]
@@ -19,21 +39,25 @@ host="0.0.0.0"
 secret="a cat"
 # Session length in seconds when "remember me" is checked
 remember=2592000 # 30 days
-# logger interface
+# logger interface for expressjs morgan
 log="dev"
-# is the server behind a proxy? true/false
-proxy=true
+# Is the server behind a proxy? true/false
+# Set this to true if you are serving Mailtrain as a virtual domain through Nginx or Apache
+proxy=false
 # maximum POST body size
 postsize="2MB"
 # Uncomment to set uploads folder location for temporary data. Defaults to os.tmpdir()
-#tmpdir=/tmp
+# If the service is started by `npm start` then os.tmpdir() points to CWD
+#tmpdir="/tmp"
 
 [mysql]
 host="localhost"
 user="mailtrain"
 password="mailtrain"
 database="mailtrain"
-port=3306 # some installations, eg. MAMP can use a different port (8889). MAMP users should turn on "Allow network access to MySQL"
+# Some installations, eg. MAMP can use a different port (8889)
+# MAMP users should also turn on "Allow network access to MySQL" otherwise MySQL might not be accessible
+port=3306
 charset="utf8mb4"
 timezone="local"
 
@@ -43,14 +67,20 @@ enabled=false
 host="localhost"
 port=6379
 db=5
-# password=""
+# Uncomment if your Redis installation requires a password
+#password=""
 
 [verp]
+# Enable to start an MX server that detects bounced messages using VERP
+# In most cases you do not want to use it
+# Requires root privileges
 enabled=false
 port=25
 host="0.0.0.0"
 
 [testserver]
+# Starts a vanity server that redirects all mail to /dev/null
+# Mostly needed for local development
 enabled=false
 port=5587
 host="0.0.0.0"