Change individual ComponentMapper instances everywhere to use Mappers
Update README
Remove some pointless comments