Move unimpaired and UltiSnips back to upstream

As the pull requests has already merged