Added statusline texts.
Merge branch 'master' of github.com:vesanieminen/vim-conf

Conflicts:
	.vimrc