jf/conda2

messed up the previous PR big time, lets do this clean and easy