Merge pull request #408 from jaredhoberock/bulk

Bulk
Update to latest Bulk
Correctly sort TestMergeByKeyToDiscardIterator's input

Fixes #409
Merge pull request #410 from jaredhoberock/issue-409

Correctly sort TestMergeByKeyToDiscardIterator's input
Merge branch 'master' of github.com:jaredhoberock/thrust into bulk