Merge branch 'master' of git://github.com/pydata/conda into addons

Conflicts:
	conda/builder/elf.py
	conda/builder/post.py
	conda/compat.py