Repaired small bug
Merge branch 'master' of https://github.com/tkozik/dotfiles

Conflicts:
	_bashrc
Changes in vim/gvim configuration