Merge branch 'master' into tweet_with_user

Conflicts:
	lib/t/cli.rb
	lib/t/delete.rb
	lib/t/list.rb
	lib/t/search.rb
Merge branch 'tweet_with_user' of github.com:dannguyen/t into tweet_with_user