Merge pull request #165 from oa/master

Updated python property snippet and added elif snippet to htmldjango

snippets/htmldjango.snippets

@@ -50,6 +50,9 @@ snippet if
 snippet else
 	{% else %}
 		${1}
+snippet elif
+	{% elif ${1} %}
+		${2}
 snippet ifchanged
 	{% ifchanged %}${1}{% endifchanged %}
 snippet ifequal

snippets/python.snippets

@@ -51,6 +51,10 @@ snippet property
 			${3:return self._$1}
 		def fset(self, value):
 			${4:self._$1 = value}
+		def fdel(self):
+			${5:del self._$1}
+		return locals()
+	$1 = property(**$1())
 # Ifs
 snippet if
 	if ${1:condition}: