Ignore .pyc file explicitly because .py[cod] wasn't working
merging in .gitignore fix
merging in remote changes