added vimrc
Merge remote-tracking branch 'origin/kinetic' into kinetic