Allowing template variables in Battery's -O and -o args

Should address github issue #109.  Thanks to Todd Lunter for the
suggestion.