Remove deprecated powerline.
vim yankring
Tweak vimrc
Merge branch 'master'

Conflicts:
	vimrc