Grains n maps

- fixed a bug in the recent refactor of grains into their own file
- merge grains from a map file with the grains defined in the profile - rather than overwriting them