tweet with user merged with master...again, sigh

cleanup work