Added PyCharm .idea to .gitignore
Forgot to change machine_identifier to machine_resolver in a few places