Removed django 1.5 - no security updates - Pegged Markdown for Python 2.6

(cherry picked from commit 5814de7a632a86eaffa7399b5ff3c7d979ce38a7)

Conflicts:
	setup.py