bashrc/ new colors, vim
Merge remote-tracking branch 'origin/master' into applicative
xmonad fix