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
Merge branch 'schooly' into replace

Conflicts:
	src/org/tsd/tsdbot/TSDBot.java