fixed #35
Various fixes and improvements.
Merge pull request #36 from dwelch91/master

Fix for sslopt and some other improvements
- prepare for 0.12.0
:Merge branch 'master' into py3

Conflicts:
	websocket.py