Various fixes to the faq
Merge branch 'master' of github.com:ContinuumIO/conda
follow_symlinks raises NotImplementedError
Still fix permissions on files if they aren't links
Fix comment
update changelog
fixed issue #471
adding test
add item to changelog
add check for chrpath (on Linux) before build is started, see issue #469
limit test to Linux
Merge branch 'master' of git://github.com/pydata/conda into addons

Conflicts:
	conda/builder/elf.py
	conda/builder/post.py
	conda/compat.py
Merge branch 'master' of git://github.com/pydata/conda into addons

Conflicts:
	conda/builder/elf.py
	conda/builder/post.py
	conda/compat.py
Merge pull request #14 from peter1000/addons

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