Updated changelog
Merge branch 'master' of github.com:funkybob/django-nap

Conflicts:
	changelog.txt