More additions to vim

More plug-ins to evaluate, read local vimrc, scrolling etc.
Use 3 way diff:

http://blog.wuwon.id.au/2010/09/painless-merge-conflict-resolution-in.html
Merge branch 'master' of github.com:kra3/dot_files