Update vundle plugins and use Plugin instead of Bundle
Update settings to reflect current vimrc
Stop overriding per-filetype tab settings
Add ultisnips bindings
Set a leader
Use asciidoc syntax for adoc files

Since github recognizes the adoc extension but not asciidoc, this
setting uses the proper highlighting when editing those files.
Merge remote-tracking branch 'upstream/master'