Merge branch 'master' of github.com:tfentonz/dotfiles

subversion/config

@@ -93,7 +93,7 @@ diff-cmd = diffwrap.sh
 ### while importing or adding files and directories.
 ### '*' matches leading dots, e.g. '*.rej' matches '.foo.rej'.
 # global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo
-global-ignores = *.DS_Store .rvmrc
+global-ignores = *.DS_Store *.swp .rvmrc .ruby-gemset .ruby-version
 #   *.rej *~ #*# .#* .*.swp .DS_Store
 ### Set log-encoding to the default encoding for log messages
 # log-encoding = latin1