update powerline
set ts for yaml
this never works like I think!
Merge branch 'master' of github.com:qqshfox/dotvim

Conflicts:
	.gitmodules