lots of changes around vim airline and mappings