commit changes for merge

*more comments in vimrc
*some new options in vimrc
*disable currently broken session management

*comment useless keybind in tmux.conf out
Merge branch 'master' of github.com:blastmaster/dofiles

Conflicts:
	vimrc

merge commit