Merge pull request #1 from neongreen/master

Remove some extra spaces.
added timestamps
added nicks (unfinished)