removing QtWebkit as a dependency for PyInstaller and for building the .deb
Merge branch 'master' of github.com:micahflee/onionshare

Conflicts:
	setup/onionshare-launcher.py
updated NSIS file