modified terminator config
Merge remote-tracking branch 'origin/master'
 modified vimrc
Merge remote-tracking branch 'origin/master'