Changing some badges in the readme.
Fixing merge conflict.