Add PyCharm .idea folder to gitignore
Merge branch 'master' into alex