revisions to pchoice

Hi @birbbit, I went over your pchoice commit and added some tests, and actually found and fixed a tpe bug that might have been obstructing your experiments.

If you are OK with these changes (and the revised pchoice syntax) then just pull them into your master branch, and that will automatically the PR you already have open on hyperopt/master.