List items formatting legibility and small install speedup

Make formatting of strings in a list a bit more legible, and remove
sd-devices from sd-workstation.top as it's a DispVM rather than a DispVM
template.

dom0/sd-logging-setup.sls

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: set syntax=yaml ts=2 sw=2 sts=2 et :
 
-{% if grains['id'] in ["securedrop-workstation-{}".format(grains['oscodename']), "sd-small-{}-template".format(grains['oscodename']), "sd-large-{}-template".format(grains['oscodename'])] %}
+{% if grains['id'] in [name.format(grains['oscodename']) for name in ["securedrop-workstation-{}", "sd-small-{}-template", "sd-large-{}-template"]] %}
 include:
   - fpf-apt-repo
 

dom0/sd-workstation.top

@@ -51,8 +51,6 @@ base:
     - sd-logging-setup
   sd-viewer:
     - sd-mime-handling
-  sd-devices:
-    - sd-mime-handling
   sd-devices-dvm:
     - sd-mime-handling
   sd-proxy: