Travis-ci outage, TheOnion Twitter hack
Fixed conflict merge