ensure has_prefix is using MacOSX shared object files
add license to info/index.json object
update changelog
* add ability to find recipes in conda-recipes subfolders:
    with pre-check for ambiguities
Merge commit '35aaf2ea1a90e23ae396a373b7ce481807ea4dcd'

Conflicts:
	conda_build/build.py
Merge commit 'a3328a74362172f3021d27cc1af2efdd01740aa3'
Merge commit 'c562a4c5b9a7fd8508ba19b59eca1d136b414ba3'

Conflicts:
	CHANGELOG.txt
Merge branch 'origin/conda-recipes_in_subfolders'

Conflicts:
	CHANGELOG.txt
	conda_build/main_build.py