expanded emoticons + fix timestamp :0 bug
Merge pull request #3 from aaronmccall/master

expanded emoticons + fix timestamp :0 bug