updated TODO
misc. cleanup
added option to toggle bot scoring
Merge remote-tracking branch 'upstream/master'
Yet another upstream merge with junkyard.rb.