Merge with github, correct gitignore