started the refresh of the options to better support merging and displaying the option source
Merge pull request #180 from EventStore/options-refresh

Make options processing more explicit