Prevent errors when vendor and bower_components contain the same files.
Merge pull request #1724 from rwjblue/prevent-merge-errors-upon-upgrade

Prevent errors when vendor and bower_components contain the same files.