python 3.3 port

not much tested yet, be careful
Merge branch 'master' into py3-port

Conflicts:
	nsupdate/main/_tests/test_main.py
fix py3 compatibility