bashrc fixes
airline vim plugin settings extracted
Merge branch 'master' into vbox

Conflicts:
	bash/bashrc.symlink