Added leftovers of merge to .gitignore
Removed compiled python files