Solutions to problem 1. Ultimate one is almost there.
add .user files to .gitignore