Update tests for embedded options (from derived classes) taking precedence
Merge branch 'master' of github.com:kmalakoff/knockback
Merge and build