Updated plugins
Merge branch 'master' of git://github.com/amix/vimrc
add authorinfo desert256
modify basic extended
add puppet syntax