Changed bulk-user-upload-2 to be bulk-user-upload as the origional has become defunct.
Merge pull request #58 from marksherman/userupload

Replace old bulk-user-upload with newer bulk-user-upload-2 because old one is defunct