Remove powerline, it slowed vim down a lot. Using airline now with some extra plugins.
Merge branch 'master' into g2-pc