Update vim plugin
Update screenrc title
Merge branch 'master' of github.com-tp:takkyuuplayer/dotfiles

Conflicts:
	.vimrc