fix bulkloader conflict
Merge pull request #112 from MayOneUS/bulkloader_conflict

Fix bulkloader.yaml conflict.  I'm fairly confident that this will result in the file that Brian wants.