Improvements to nsigen module
Merge branch 'master' of github.com:takluyver/pynsist

Conflicts:
	nsist/nsigen.py