Merge pull request #428 from ubergrape/master

Add ignore_conflicts parameter to put_mapping
Fixed count