merge and fix gitignore
???
grrr