Merge pull request #42 from mceloud/master

fix options setting in resolv
diff --git a/README.rst b/README.rst
index 206b360..b2cf09f 100644
--- a/README.rst
+++ b/README.rst
@@ -545,6 +545,10 @@
           search:
             - my.example.com
             - example.com
+          options:
+            - ndots:5
+            - timeout:2
+            - attempts:2
 
 Linux storage pillars
 ---------------------
diff --git a/linux/files/resolv.conf b/linux/files/resolv.conf
index ab5d807..43fb75d 100644
--- a/linux/files/resolv.conf
+++ b/linux/files/resolv.conf
@@ -10,5 +10,7 @@
 nameserver {{ nameserver }}
 {%- endfor %}
 {%- if network.resolv.get('options', False) %}
-options {{ options|sort|join(' ') }}
+{%- for option in network.resolv.options %}
+options {{ option }}
+{%- endfor %}
 {%- endif %}