Add Airline in place of Powerline, rearrange file, some other updates.