diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..412eeda7
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/.gitignore b/.gitignore
index b9d6bd92..3215c008 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ local.properties
 .classpath
 .settings/
 .loadpath
+.idea
 
 # External tool builders
 .externalToolBuilders/
diff --git a/openhab/owserver.xml b/openhab/owserver.xml
index aacdfdb3..e881a166 100644
--- a/openhab/owserver.xml
+++ b/openhab/owserver.xml
@@ -1,4 +1,6 @@
+<!-- Binding configuration for the SNMP binding in openHAB -->
 <binding>
+    <!-- Binding configuration settings -->
     <binding.config>
         <setting>
             <name>cache</name>
@@ -30,6 +32,8 @@
             <maximum>10000</maximum>
             <values></values>
         </setting>
+
+        <!-- The following lines specify the communications interface settings. These may be repeated multiple times -->
         <setting>
             <name>.host</name>
             <label>IP Address</label>
@@ -52,14 +56,16 @@
         </setting>
     </binding.config>
 
+    <!-- Item binding configuration -->
     <binding.items>
         <binding.io>
-            <type>Input (GET)</type>
+            <type>Input</type>
             <description></description>
             <parameters>
                 <parameter>
-                    <name>Address</name>
-                    <description>Sets the IP address of the SNMP device.</description>
+                    <name>interface</name>
+                    <label>Communications Interface</label>
+                    <description>Set the symbolic name of the communication interface.</description>
                     <optional>false</optional>
                     <default></default>
                     <minimum></minimum>
@@ -67,8 +73,9 @@
                     <values></values>
                 </parameter>
                 <parameter>
-                    <name>Community</name>
-                    <description>Sets the SNMP community for the GET request.</description>
+                    <name>romid</name>
+                    <label>ROM ID</label>
+                    <description>Set the ROM ID of the One Wire device.</description>
                     <optional>false</optional>
                     <default></default>
                     <minimum></minimum>
@@ -76,8 +83,9 @@
                     <values></values>
                 </parameter>
                 <parameter>
-                    <name>OID</name>
-                    <description>Sets the Object ID for the SNMP GET.</description>
+                    <name>parameter</name>
+                    <label>Parameter Name</label>
+                    <description>Sets the Parameter Name from the One Wire device.</description>
                     <optional>false</optional>
                     <default></default>
                     <minimum></minimum>
@@ -95,94 +103,5 @@
                 </parameter>
             </parameters>
         </binding.io>
-        <binding.io>
-            <type>Input (TRAP)</type>
-            <description></description>
-            <parameters>
-                <parameter>
-                    <name>Address</name>
-                    <description>Sets the IP address of the SNMP device.</description>
-                    <optional>false</optional>
-                    <default></default>
-                    <minimum></minimum>
-                    <maximum></maximum>
-                    <values></values>
-                </parameter>
-                <parameter>
-                    <name>Community</name>
-                    <description>Sets the SNMP community for the GET request.</description>
-                    <optional>false</optional>
-                    <default></default>
-                    <minimum></minimum>
-                    <maximum></maximum>
-                    <values></values>
-                </parameter>
-                <parameter>
-                    <name>OID</name>
-                    <description>Sets the Object ID for the SNMP GET.</description>
-                    <optional>false</optional>
-                    <default></default>
-                    <minimum></minimum>
-                    <maximum></maximum>
-                    <values></values>
-                </parameter>
-            </parameters>
-        </binding.io>
-        <binding.io>
-            <type>Output (SET)</type>
-            <description></description>
-            <parameters>
-                <parameter>
-                    <name>Command String</name>
-                    <description>Sets the command string that will appear in the openHAB GUI.</description>
-                    <optional>false</optional>
-                    <default></default>
-                    <minimum></minimum>
-                    <maximum></maximum>
-                    <values></values>
-                </parameter>
-                <parameter>
-                    <name>Address</name>
-                    <description>Sets the IP address of the SNMP device.</description>
-                    <optional>false</optional>
-                    <default></default>
-                    <minimum></minimum>
-                    <maximum></maximum>
-                    <values></values>
-                </parameter>
-                <parameter>
-                    <name>Community</name>
-                    <description>Sets the SNMP community for the SET request.</description>
-                    <optional>false</optional>
-                    <default></default>
-                    <minimum></minimum>
-                    <maximum></maximum>
-                    <values></values>
-                </parameter>
-                <parameter>
-                    <name>OID</name>
-                    <description>Sets the Object ID for the SNMP SET.</description>
-                    <optional>false</optional>
-                    <default></default>
-                    <minimum></minimum>
-                    <maximum></maximum>
-                    <values></values>
-                </parameter>
-                <parameter>
-                    <name>Value</name>
-                    <description>Sets the command value for the SNMP SET.</description>
-                    <optional>false</optional>
-                    <default></default>
-                    <minimum></minimum>
-                    <maximum></maximum>
-                    <values></values>
-                </parameter>
-            </parameters>
-        </binding.io>
     </binding.items>
 </binding>
-
-
-
-
-
diff --git a/openhab/snmp.xml b/openhab/snmp.xml
index bfbc63a8..d56f1c11 100644
--- a/openhab/snmp.xml
+++ b/openhab/snmp.xml
@@ -1,4 +1,6 @@
+<!-- Binding configuration for the EDS One Wire Server binding in openHAB -->
 <binding>
+    <!-- Binding configuration settings -->
     <binding.config>
         <setting>
             <name>port</name>
@@ -46,13 +48,15 @@
         </setting>
     </binding.config>
 
+    <!-- Item binding configuration -->
     <binding.items>
         <binding.io>
             <type>Input (GET)</type>
             <description></description>
             <parameters>
                 <parameter>
-                    <name>Address</name>
+                    <name>address</name>
+                    <label>IP Address</label>
                     <description>Sets the IP address of the SNMP device.</description>
                     <optional>false</optional>
                     <default></default>
@@ -61,7 +65,8 @@
                     <values></values>
                 </parameter>
                 <parameter>
-                    <name>Community</name>
+                    <name>community</name>
+                    <label>SNMP Community</label>
                     <description>Sets the SNMP community for the GET request.</description>
                     <optional>false</optional>
                     <default></default>
@@ -70,7 +75,8 @@
                     <values></values>
                 </parameter>
                 <parameter>
-                    <name>OID</name>
+                    <name>oid</name>
+                    <label>Object ID</label>
                     <description>Sets the Object ID for the SNMP GET.</description>
                     <optional>false</optional>
                     <default></default>
@@ -79,7 +85,8 @@
                     <values></values>
                 </parameter>
                 <parameter>
-                    <name>Polling period</name>
+                    <name>period</name>
+                    <label>Polling period</label>
                     <description>Sets polling period (in milliseconds between each request.</description>
                     <optional>false</optional>
                     <default>5000</default>
@@ -94,7 +101,8 @@
             <description></description>
             <parameters>
                 <parameter>
-                    <name>Address</name>
+                    <name>address</name>
+                    <label>IP Address</label>
                     <description>Sets the IP address of the SNMP device.</description>
                     <optional>false</optional>
                     <default></default>
@@ -103,7 +111,8 @@
                     <values></values>
                 </parameter>
                 <parameter>
-                    <name>Community</name>
+                    <name>community</name>
+                    <label>SNMP Community</label>
                     <description>Sets the SNMP community for the GET request.</description>
                     <optional>false</optional>
                     <default></default>
@@ -112,7 +121,8 @@
                     <values></values>
                 </parameter>
                 <parameter>
-                    <name>OID</name>
+                    <name>oid</name>
+                    <label>Object ID</label>
                     <description>Sets the Object ID for the SNMP GET.</description>
                     <optional>false</optional>
                     <default></default>
@@ -127,7 +137,8 @@
             <description></description>
             <parameters>
                 <parameter>
-                    <name>Command String</name>
+                    <name>command</name>
+                    <label>Command String</label>
                     <description>Sets the command string that will appear in the openHAB GUI.</description>
                     <optional>false</optional>
                     <default></default>
@@ -136,7 +147,8 @@
                     <values></values>
                 </parameter>
                 <parameter>
-                    <name>Address</name>
+                    <name>address</name>
+                    <label>IP Address</label>
                     <description>Sets the IP address of the SNMP device.</description>
                     <optional>false</optional>
                     <default></default>
@@ -145,7 +157,8 @@
                     <values></values>
                 </parameter>
                 <parameter>
-                    <name>Community</name>
+                    <name>community</name>
+                    <label>SNMP Community</label>
                     <description>Sets the SNMP community for the SET request.</description>
                     <optional>false</optional>
                     <default></default>
@@ -154,7 +167,8 @@
                     <values></values>
                 </parameter>
                 <parameter>
-                    <name>OID</name>
+                    <name>oid</name>
+                    <label>Object ID</label>
                     <description>Sets the Object ID for the SNMP SET.</description>
                     <optional>false</optional>
                     <default></default>
@@ -163,7 +177,8 @@
                     <values></values>
                 </parameter>
                 <parameter>
-                    <name>Value</name>
+                    <name>value</name>
+                    <label>Value</label>
                     <description>Sets the command value for the SNMP SET.</description>
                     <optional>false</optional>
                     <default></default>