update from tboz2033.terminal.com
Merge branch 'master' of http://github.com/tboz203/config

Conflicts:
	vim/bundle/powerline
	vim/bundle/vim-commentary