diff --git a/ikiwiki.setup b/ikiwiki.setup
index c6377ed1ae..becf33b607 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -10,7 +10,7 @@
 # name of the wiki
 wikiname: git-annex
 # contact email for wiki
-adminemail: joey@kitenet.net
+adminemail: admin@branchable.com
 # users who are wiki admins
 adminuser:
 - http://joey.kitenet.net/
@@ -30,6 +30,8 @@ destdir: /home/b-git-annex/public_html
 url: http://git-annex.branchable.com
 # url to the ikiwiki.cgi
 cgiurl: http://git-annex.branchable.com/ikiwiki.cgi
+# do not adjust cgiurl if CGI is accessed via different URL
+reverse_proxy: 0
 # filename of cgi wrapper to generate
 cgi_wrapper: /var/www/b-git-annex/ikiwiki.cgi
 # mode for cgi_wrapper (can safely be made suid)
@@ -96,7 +98,7 @@ indexpages: 0
 discussion: 0
 # name of Discussion pages
 discussionpage: Discussion
-# generate HTML5?
+# use elements new in HTML5 like <section>?
 html5: 0
 # only send cookies over SSL connections?
 sslcookie: 0
@@ -118,7 +120,9 @@ hardlink: 1
 #umask: public
 # group for wrappers to run in
 #wrappergroup: ikiwiki
-# extra library and plugin directory
+# extra library and plugin directories
+libdirs: []
+# extra library and plugin directory (searched after libdirs)
 libdir: /home/b-git-annex/.ikiwiki
 # environment variables
 ENV: {}
@@ -135,11 +139,15 @@ allow_symlinks_before_srcdir: 0
 # cookie control
 cookiejar:
   file: /home/b-git-annex/.ikiwiki/cookies
+# set custom user agent string for outbound HTTP requests e.g. when fetching aggregated RSS feeds
+useragent: ikiwiki/3.20150330
+# theme has a responsive layout? (mobile-optimized)
+responsive_layout: 1
 
 ######################################################################
 # core plugins
 #   (branchable, editpage, git, gitpush, htmlscrubber, ikiwikihosting,
-#    inline, link, meta, parentlinks)
+#    inline, link, meta, parentlinks, templatebody)
 ######################################################################
 
 # branchable plugin
@@ -184,7 +192,7 @@ htmlscrubber_skip: testimonials or builds
 # ikiwikihosting plugin
 # list of urls that alias to the main url
 #urlalias: []
-# openid of primary site owner
+# openid or email of primary site owner
 owner: http://joey.kitenet.net/
 # optional hostname of site this one was branched from
 #parent: ''
@@ -196,6 +204,8 @@ created: 1287531313
 #log_period: 7
 # disable IPv6?
 ipv6_disabled: 0
+# redirect from http to https?
+redirect_to_https: 0
 
 # inline plugin
 # enable rss feeds by default?
@@ -211,7 +221,7 @@ pingurl: []
 
 ######################################################################
 # auth plugins
-#   (anonok, blogspam, httpauth, lockedit, moderatedcomments,
+#   (anonok, blogspam, emailauth, httpauth, lockedit, moderatedcomments,
 #    opendiscussion, openid, passwordauth, signinedit)
 ######################################################################
 
@@ -224,7 +234,7 @@ pingurl: []
 blogspam_pagespec: postcomment(*)
 # options to send to blogspam server
 #blogspam_options: blacklist=1.2.3.4,blacklist=8.7.6.5,max-links=10
-# blogspam server XML-RPC url
+# blogspam server JSON url
 #blogspam_server: ''
 
 # httpauth plugin
@@ -261,7 +271,7 @@ openid_cgiurl: http://git-annex.branchable.com/ikiwiki.cgi
 
 # highlight plugin
 # types of source files to syntax highlight
-tohighlight: '.sh .hs .pl .c'
+tohighlight: .sh .hs .pl .c
 # location of highlight's filetypes.conf
 filetypes_conf: /etc/highlight/filetypes.conf
 # location of highlight's langDefs directory
@@ -278,8 +288,8 @@ langdefdir: /usr/share/highlight/langDefs
 #po_master_language: en|English
 # slave languages (translated via PO files) format: ll|Langname
 #po_slave_languages:
-#- fr|Français
-#- es|Español
+#- fr|Français
+#- es|Español
 #- de|Deutsch
 # PageSpec controlling which pages are translatable
 po_translatable_pages: ''
@@ -405,8 +415,12 @@ websetup_show_unsafe: 0
 # calendar plugin
 # base of the archives hierarchy
 archivebase: ''
-# PageSpec of pages to include in the archives; used by ikiwiki-calendar command
+# PageSpec of pages to include in the archives, if option `calendar_autocreate` is true.
 archive_pagespec: ''
+# autocreate new calendar pages?
+calendar_autocreate: 1
+# if set, when building calendar pages, also build pages of year and month when no pages were published (building empty calendars).
+calendar_fill_gaps: 1
 
 # listdirectives plugin
 # directory in srcdir that contains directive descriptions
@@ -437,10 +451,11 @@ directive_description_dir: ikiwiki/directive
 ######################################################################
 # other plugins
 #   (aggregate, autoindex, brokenlinks, camelcase, ddate, embed, favicon,
-#    filecheck, flattr, goodstuff, htmlbalance, localstyle, missingsite,
-#    notifyemail, pagetemplate, parked, pingee, pinger, prettydate,
-#    recentchanges, recentchangesdiff, relativedate, rsync, sidebar,
-#    smiley, sortnaturally, tag, testpagespec, trail, transient, typography)
+#    filecheck, flattr, goodstuff, htmlbalance, localstyle, loginselector,
+#    missingsite, notifyemail, pagetemplate, parked, pingee, pinger,
+#    prettydate, recentchanges, recentchangesdiff, relativedate, rsync,
+#    sidebar, smiley, sortnaturally, tag, testpagespec, trail, transient,
+#    typography)
 ######################################################################
 
 # aggregate plugin