copy_dir() recursive overwrite fix
copy_dir() recursive overwrite test updates
Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'master' of github.com:adroullier/pyramid into adroullier-master
Merge branch 'adroullier-master'