Temporarily update vimrc to prepare for pull.
Add a few bundles: Airline and GLSL
Merging to Master
Update .netrwhist