added airline to vim
fixing merge
changes
configu changes for airline