Moving option_merge into a folder
Adding some helper functions for working with strings and dicts
Adding storage class
Using storage to implement MergedOptions