Merge branch 'master' of https://git.friedersdorff.com/max/saltfiles

diff --cc states/termite/files/config
index bab31a3526564bd0b5656a478c1118c597ffa367,97ccbae8cd701953e7ccaa1009a68118a70c826f..7d99708203023ae0c13d4811ebb94df359ff41f1
--- 1/states/termite/files/config
--- 2/states/termite/files/config
+++ b/states/termite/files/config
@@@ -6,7 -6,7 +6,7 @@@
        {% set font_size = 11 %}
  {% endif %}
  
- {% if grains['host'] in ['barium', 'dubnium'] %}
 -{% if grains['host'] == 'barium' or grains['host'] == 'rhenium' %}
++{% if grains['host'] in ['barium', 'dubnium', 'rhenium'] %}
        {% set font_family = 'Source Code Pro' %}
  {% else %}
        {% set font_family = 'Source Code Pro for Powerline' %}