Including a bunch of dot files and cleanup
Fix for UltiSnips, additional plugins
Re-adding nerdtree
The real fix for UltiSnips
Setting proper private and runtimepath
Merge branch 'master' into linux

Conflicts:
	.vimrc