Fix the code

I guess I shouldn't assume that Sean actually tested the code that he wrote.
Merge branch 'master' of github.com:conda/conda-build