Including a bunch of dot files and cleanup
Fix for UltiSnips, additional plugins