Fixed the flocking, made the flocking groups merge correctly, added .meta to gitignore.