Fix building when some of the built files are symbolic links
make psutil optional for building on Windows
copy symlinks as symlinks

rather than copying file contents or hard linking.
Merge pull request #408 from asmeurer/links

Symbolic links in recipes
Merge pull request #437 from minrk/copy-symlinks

copy symlinks as symlinks
Use shlex.split for the conda build tests

This makes it preserve quoted text correctly.
Merge branch 'master' of github.com:ContinuumIO/conda
remove unused variable
update changelog
Merge branch 'master' of git://github.com/ContinuumIO/conda

Conflicts:
	CHANGELOG.txt