parameterize logging variables
remove trailing line breaks from template
add spec tests for optional parameters
small fixes
Merge pull request #2 from Phil-Friderici/logging

parameterize logging variables