add syntastic, airline to plugins, revisit some colors and settings
merge
remove ugly mergemarkers