Do most of port to 1.7.10
Remove some files that got added by mistake
fix gitignore some more