Airline, NerdTreeTabs, fixed some config
Merge branch 'dyson' of https://github.com/jonnydark/Vim into dyson

Conflicts:
	.vimrc
	vimfiles/bundle/vundle