assorted cleanup, and bump to newest version of twitter gem