corrections on benchunits files
fixed conflict
Merge branch 'master' of https://github.com/JuliaStats/MCMC.jl