Merge branch 'master' into schooly
moving twitter info to properties
adding debug flag to command line args and using it to disable twitter streaming
moving twitter info to properties
adding debug flag to command line args and using it to disable twitter streaming
Adding a replacer function that can handle /s/find/replace/user.
Merge branch 'schooly' into replace

Conflicts:
	src/org/tsd/tsdbot/TSDBot.java
making strawpoll less spammy. pulling in the replace feature branch
Merge branch 'replace' into schooly
pulling history buffer out of Replacer
making strawpoll less spammy
Merge branch 'schooly'