diff --git a/ikiwiki.setup b/ikiwiki.setup
index 542c43dd33..fc491a30e4 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -10,7 +10,6 @@
 # name of the wiki
 wikiname: git-annex
 # contact email for wiki
-only_committed_changes: 1
 adminemail: joey@kitenet.net
 # users who are wiki admins
 adminuser:
@@ -29,18 +28,20 @@ cgiurl: http://git-annex.branchable.com/ikiwiki.cgi
 # filename of cgi wrapper to generate
 cgi_wrapper: /var/www/b-git-annex/ikiwiki.cgi
 # mode for cgi_wrapper (can safely be made suid)
-cgi_wrappermode: '0755'
+cgi_wrappermode: 0755
 # number of seconds to delay CGI requests when overloaded
 cgi_overload_delay: 10
 # message to display when overloaded (may contain html)
-cgi_overload_message: 'Please wait..'
+cgi_overload_message: Please wait..
+# enable optimization of only refreshing committed changes?
+only_committed_changes: 1
 # rcs backend to use
 rcs: git
 # plugins to add to the default configuration
 add_plugins:
 - goodstuff
 - websetup
-- '404'
+- 404
 - ikiwikihosting
 - branchable
 - recentchangesdiff
@@ -80,21 +81,21 @@ underlaydir: /usr/share/ikiwiki/basewiki
 # display verbose messages?
 #verbose: 1
 # log to syslog?
-syslog: '1'
+syslog: 1
 # create output files named page/index.html?
-usedirs: '1'
+usedirs: 1
 # use '!'-prefixed preprocessor directives?
-prefix_directives: '1'
+prefix_directives: 1
 # use page/index.mdwn source files
-indexpages: '0'
+indexpages: 0
 # enable Discussion pages?
-discussion: '0'
+discussion: 0
 # name of Discussion pages
 discussionpage: Discussion
 # generate HTML5?
-html5: '0'
+html5: 0
 # only send cookies over SSL connections?
-sslcookie: '0'
+sslcookie: 0
 # extension to use for new pages
 default_pageext: mdwn
 # extension to use for html files
@@ -106,9 +107,9 @@ timeformat: '%c'
 # put user pages below specified page
 userdir: users
 # how many backlinks to show before hiding excess (0 to show all)
-numbacklinks: '10'
+numbacklinks: 10
 # attempt to hardlink source files? (optimisation for large files)
-hardlink: '1'
+hardlink: 1
 # force ikiwiki to use a particular umask (keywords public, group or private, or a number)
 #umask: public
 # group for wrappers to run in
@@ -126,7 +127,10 @@ timezone: GMT
 # specifies the characters that are allowed in source filenames
 wiki_file_chars: -[:alnum:]+/.:_
 # allow symlinks in the path leading to the srcdir (potentially insecure)
-allow_symlinks_before_srcdir: '0'
+allow_symlinks_before_srcdir: 0
+# cookie control
+cookiejar:
+  file: /home/b-git-annex/.ikiwiki/cookies
 
 ######################################################################
 # core plugins
@@ -136,11 +140,11 @@ allow_symlinks_before_srcdir: '0'
 
 # branchable plugin
 # Allow anyone to branch, check out, and copy this site?
-branchable: '1'
+branchable: 1
 # Allow anyone to git push verified changes to this site?
-anonpush: '1'
+anonpush: 1
 # Display "Branchable" link on action bar?
-branchable_action: '1'
+branchable_action: 1
 
 # git plugin
 # git hook to generate
@@ -148,7 +152,7 @@ git_wrapper: /home/b-git-annex/source.git/hooks/post-update
 # shell command for git_wrapper to run, in the background
 #git_wrapper_background_command: git push github
 # mode for git_wrapper (can safely be made suid)
-#git_wrappermode: '06755'
+#git_wrappermode: 06755
 # git pre-receive hook to generate
 git_test_receive_wrapper: /home/b-git-annex/source.git/hooks/pre-receive
 # unix users whose commits should be checked by the pre-receive hook
@@ -183,17 +187,17 @@ owner: http://joey.kitenet.net/
 # internal hostname of this site
 hostname: git-annex.branchable.com
 # site creation datestamp
-created: '1287531313'
+created: 1287531313
 # how many days to retain logs
 #log_period: 7
 # disable IPv6?
-ipv6_disabled: '0'
+ipv6_disabled: 0
 
 # inline plugin
 # enable rss feeds by default?
-rss: '1'
+rss: 1
 # enable atom feeds by default?
-atom: '1'
+atom: 1
 # allow rss feeds to be used?
 #allowrss: 0
 # allow atom feeds to be used?
@@ -280,12 +284,12 @@ po_link_to: default
 
 ######################################################################
 # special-purpose plugins
-#   (osm)
+#   (osm, underlay)
 ######################################################################
 
 # osm plugin
 # the default zoom when you click on the map link
-#osm_default_zoom: '15'
+#osm_default_zoom: 15
 # the icon shown on links and on the main map
 #osm_default_icon: ikiwiki/images/osm.png
 # the alt tag of links, defaults to empty
@@ -302,10 +306,15 @@ po_link_to: default
 # Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key
 #osm_google_apikey: ''
 
+# underlay plugin
+# extra underlay directories to add
+#add_underlays:
+#- /home/b-git-annex/wiki.underlay
+
 ######################################################################
 # web plugins
-#   (404, attachment, comments, editdiff, edittemplate, google, goto,
-#    mirrorlist, remove, rename, repolist, search, theme, userlist,
+#   (404, attachment, comments, editdiff, edittemplate, getsource, google,
+#    goto, mirrorlist, remove, rename, repolist, search, theme, userlist,
 #    websetup, wmd)
 ######################################################################
 
@@ -325,11 +334,17 @@ comments_closed_pagespec: ''
 # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12"
 comments_pagename: comment_
 # Interpret directives in comments?
-comments_allowdirectives: '1'
+comments_allowdirectives: 1
 # Allow anonymous commenters to set an author name?
 #comments_allowauthor: 0
 # commit comments to the VCS
-comments_commit: '1'
+comments_commit: 1
+# Restrict formats for comments to (no restriction if empty)
+comments_allowformats: ''
+
+# getsource plugin
+# Mime type for returned source.
+#getsource_mimetype: text/plain; charset=utf-8
 
 # mirrorlist plugin
 # list of mirrors
@@ -346,6 +361,7 @@ repositories:
 # search plugin
 # path to the omega cgi program
 omega_cgi: /usr/lib/cgi-bin/omega/omega
+# use google site search rather than internal xapian index?
 google_search: 1
 
 # theme plugin
@@ -371,7 +387,7 @@ websetup_unsafe:
 - repositories
 - sslcookie
 # show unsafe settings, read-only, in web interface?
-websetup_show_unsafe: '0'
+websetup_show_unsafe: 0
 
 ######################################################################
 # widget plugins
@@ -420,22 +436,18 @@ directive_description_dir: ikiwiki/directive
 #    filecheck, flattr, goodstuff, htmlbalance, localstyle, missingsite,
 #    notifyemail, pagetemplate, parked, pingee, pinger, prettydate,
 #    recentchanges, recentchangesdiff, relativedate, rsync, sidebar,
-#    smiley, sortnaturally, tag, testpagespec, trail, transient,
-#    typography, underlay)
+#    smiley, sortnaturally, tag, testpagespec, trail, transient, typography)
 ######################################################################
 
 # aggregate plugin
 # enable aggregation to internal pages?
-aggregateinternal: '1'
+aggregateinternal: 1
 # allow aggregation to be triggered via the web?
 #aggregate_webtrigger: 0
-# cookie control
-cookiejar:
-  file: /home/b-git-annex/.ikiwiki/cookies
 
 # autoindex plugin
 # commit autocreated index pages
-autoindex_commit: '1'
+autoindex_commit: 1
 
 # camelcase plugin
 # list of words to not turn into links
@@ -461,7 +473,7 @@ prettydateformat: '%X, %B %o, %Y'
 # name of the recentchanges page
 recentchangespage: recentchanges
 # number of changes to track
-recentchangesnum: '100'
+recentchangesnum: 100
 
 # rsync plugin
 # command to run to sync updated pages
@@ -469,7 +481,7 @@ recentchangesnum: '100'
 
 # sidebar plugin
 # show sidebar page on all pages?
-global_sidebars: '1'
+global_sidebars: 1
 
 # tag plugin
 # parent page tags are located under
@@ -477,13 +489,8 @@ global_sidebars: '1'
 # autocreate new tag pages?
 #tag_autocreate: 1
 # commit autocreated tag pages
-tag_autocreate_commit: '1'
+tag_autocreate_commit: 1
 
 # typography plugin
 # Text::Typography attributes value
-#typographyattributes: '3'
-
-# underlay plugin
-# extra underlay directories to add
-#add_underlays:
-#- /home/b-git-annex/wiki.underlay
+#typographyattributes: 3