Merge pull request #162 from stevvooe/timestamp-layout

Allow configuration of timestamp layout