pep8 and so on
Merge branch 'master' of github.com:asmaps/nsupdate.info

Conflicts:
	nsupdate/main/models.py
	nsupdate/main/views.py