merging dom's auto-tweet shiz
Merge remote-tracking branch 'upstream/master'