.gitignore changes for pycharm
Merge branch 'moreignore'
Catch extra socket exceptions