Merge .gitignore files + add hook to update server