Merge pull request #4 from tdunning/master

Working version
merging Ted's latest pull request
forgot test file
better tokenization of tweetstream
get rid of hyphens
consolidated ontick function, purged dead code
make user refresh less frenetic, every 5 secs
make topologies use different status files (duh), and comment out topology shutoff in 10 min so it runs forever
center labels inside circles, other Nitin feedback on markup/styles
finishing touches
deploy changes
relabeling, styles
merging Ted's changes
turn off some logging
get rid of compile error
not picking up props file for some reason, so hardcode it for now
new defaults for window
ugh, frustrating
new defaults for usernames window
Merge pull request #2 from boorad/master

merging conflicts, getting sync'd up