Fix merge

roles/shell/tasks/bzflag.yml

@@ -9,7 +9,7 @@
     mode: 0770
     recurse: yes
 
-- name: Install znc target
+- name: Install bzflag target
   copy:
     dest: /etc/systemd/system/bzflag.service
     content: |
@@ -27,12 +27,3 @@
 
       [Install]
       WantedBy=multi-user.target
-
-
-#- name: Install znc user script
-#  copy:
-#    src: ../files/var/lib/znc/create-znc_account.sh
-##    dest: /var/lib/znc/create-znc_account.sh
-#    owner: znc
-##    group: root
-#    mode: 0770

roles/shell/tasks/packages.yml

@@ -1,4 +1,4 @@
-# Install our baseline packages for all machines, irrespective of what role they might have
+# Install our shell role packages for all machines
 ---
 - name: Add apt key for weechat
   apt_key:

roles/shell/tasks/ufw.yml

@@ -1,4 +1,4 @@
-# Install our baseline packages for all machines, irrespective of what role they might have
+# Configure UFW rules
 ---
 - name: Create UFW tcp rules 
   ufw: