Allow the second argument to Fn::Join to be a value, not a list.
Merge pull request #23 from bazaarvoice/ssmith-join

Allow the second argument to Fn::Join to be a value, not a list.