django 1.5.5
license / readme update
Merge branch 'master' into django-1-5-5

Conflicts:
	.gitignore
	README.md
	dndtools/local.py.sample
updated settings to be split global / local
local.py to ignore