Fixed botched merge. Apparently, git doesn't like cp....