Fixed the order options were put in the final target dict.

As it was, the template options overwrote the target options and it should work the other way around
Bumped patch version
Merge branch 'hotfix/option_precedence'