fixed bug in creating grains in seperate file.

Refs saltstack/salt-cloud#672
merge grains from map file with existing grains, instead of overwriting
Merge pull request #685 from mafrosis/grains_n_maps

Grains n maps