Cleaning up gitignore (again)

Don't need to track my Pycharm workspace from one machine to the next.
Merge branch 'master' of https://github.com/millejoh/Islands

Conflicts:
	.idea/workspace.xml