Added vi -> vim alias
Replaced vim-gitgutter with vim-signify
Added xcape as submodule

This removes one step of having to clone the xcape repo on a new system
and puts the xcape binary in an expected path.
Added starting xcape to .xsessionrc
Commented out currently unused startup progs from xsessionrc
Updated diffconflicts script to handle filenames with spaces

Funny anecdote, in the 3.5 years I've been using this script I haven't
run into a file with spaces in the name until now. That's a pretty good
run. :)