Add Airline
Merge vimrc