Merge branch 'master' into 0.2

Conflicts:
	AUTHORS

AUTHORS

@@ -1,2 +1,6 @@
 David Barroso <[email protected]>
+<<<<<<< HEAD
 Elisa Jasinska <[email protected]>
+=======
+Elisa Jasinska <[email protected]>
+>>>>>>> master

README.md

@@ -2,11 +2,12 @@ NAPALM
 ======
 NAPALM (Network Automation and Programmability Abstraction Layer with Multivendor support) is python library that implements a set of functions to interact with different vendors using a unified API.
 
+![NAPALM logo](static/logo.png?raw=true "NAPALM logo")
+
 NAPALM supports several methods to connect to the devices, to manipulate configuration and to retrieve data.
 
 Supported Network Operating Systems
 -----------------------------------
-
  * EOS - Using [pyEOS](https://github.com/spotify/pyeos). You need version 4.14.6M or superior.
  * JunOS - Using [junos-eznc](https://github.com/Juniper/py-junos-eznc)
  * IOS-XR - Using [pyIOSXR](https://github.com/fooelisa/pyiosxr)
@@ -21,14 +22,15 @@ Supported Network Operating Systems
 
 Documentation
 =============
-
 Before using the library, please, read the documentation (link below). Specially the "caveats" section:
 
 See the [Read the Docs](http://napalm.readthedocs.org)
 
+You can also watch a [live demo](https://youtu.be/93q-dHC0u0I) of NAPALM to see what it is and what it can do for you.
+
+
 Install
 =======
-
 To install, execute:
 
 ``
@@ -37,5 +39,19 @@ To install, execute:
 
 Ansible
 =======
+There is an ansible module provided by this API. Make sure you read the documentation and you understand how it works before trying to use it.
+
+Mailing List
+=======
+If you have any questions, join the users' mailing list at [[email protected]](mailto:[email protected]) and if you are developer and want to contribute to NAPALM feel free to join to the developers' mailing list at [[email protected]](mailto:[email protected])
+
+IRC
+===
+
+You can find the homologous IRC channels on freenode #napalm-automation and #napalm-dev. Feel free to join if you prefer a more direct approach.
+
+Authors
+=======
+ * David Barroso ([[email protected]](mailto:[email protected]))
+ * Elisa Jasinska ([[email protected]](mailto:[email protected]))
 
-There is an ansible module provided by this API. Make sure you read the documentation and you understand how it works before trying to use it.

ansible/napalm_install_config

@@ -141,7 +141,7 @@ def main():
     else:
         device.load_merge_candidate(filename=config_file)
 
-    diff = device.compare_config()
+    diff = device.compare_config().encode('utf-8')
     changed = len(diff) > 0
 
     if diff_file is not None: