removed places, added .gitignore, restored init.el
merged gitignore