Removed Github badge, relocated twitter badge.
Removed Github badge, relocated twitter badge, resolved merge conflicts.