Added more parameterizations
normalize fail message format

Use angle brackets around <$param> in message to make it clear when a
variable is blank.
Merge pull request #30 from ghoneycutt/add_more_params

Add more params