fix conda recipe
Merge branch 'master' of https://github.com/ContinuumIO/ache

Conflicts:
	conda.recipe/build.sh