Merge branch 'master' into systemd-xsession

templates/i3/i3.config.j2

@@ -397,6 +397,6 @@ for_window [class="^URxvt$" title="^tmux-workspace$"] border none
 
 ### Autostart
 
-exec "{{default_terminal}}"
+#exec "{{default_terminal}}"
 
 exec --no-startup-id "~/bin/i3-watchers"