  .config/orcsome/rc.py                 |   31 +++---------------
  .gtkrc-2.0.mine                       |   17 +++++++++-
  .mplayer/config                       |   38 +---------------------
- .vimrc                                |   22 +++++++++----
+ .vimrc                                |   17 +++++++---
  .xinitrc                              |    8 ++---
  bin/box-session.sh                    |    4 ++
  bin/check-mail                        |    2 +

 etc/X11/xorg.conf.d/50-synaptics.conf |   53 ++++++++++++++++++++++++++----
 etc/X11/xorg.conf.d/50-vmmouse.conf   |    7 ++++
 etc/asound.conf                       |   17 +++-------
 18 files changed, 182 insertions(+), 133 deletions(-)
 create mode 100644 etc/X11/xorg.conf.d/50-joystick.conf
 create mode 100644 etc/X11/xorg.conf.d/50-vmmouse.conf


 inoremap OA <nop>
 inoremap OB <nop>
 inoremap OC <nop>
@@ -96,10 +101,15 @@ augroup END
 nnoremap <leader>m :VialQuickOpen<cr>
 
 
+" UltiSnips
+let g:UltiSnipsJumpForwardTrigger="<tab>"
+let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
+
