Resolved merge conflict, and removed twitter bot from active code.