Update with latest indenting, Powerline/Airline changes