remove stupid crap
merge
add some colors
colors and mvim