Merge remote-tracking branch 'stevee/namecheap.com'

Conflicts:
	src/ddns/providers.py

diff --cc ddns.conf.sample
Simple merge

diff --cc src/ddns/__init__.py
Simple merge

diff --cc src/ddns/providers.py
index f4944be255e808712ce239f5ccbe212567e6231d,9ffd264b916ffc7e655b3ae639b7153bd31e469a..acd0253170cacef460799ba39289c7c0bbeb9a41
--- 1/src/ddns/providers.py
--- 2/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@@ -20,7 -20,7 +20,8 @@@
  ###############################################################################
  
  import logging
 +import urllib2
+ import xml.dom.minidom
  
  from i18n import _