Fixes naming in bolts for options to work right after plan(name before going to an identity key)
Merge pull request #391 from twitter/feature/branchA

Fixes naming in bolts for options to work right after plan(name before g...