Updating vim modules, adding airline, markdown and more
Resolve merge conflicts