added username, fixed name
Merge branch 'master' of github.com:kmdaniel/tweet-2-json