diff --git a/after/plugin/snipMate.vim b/after/plugin/snipMate.vim
index 1d995ef..157a93c 100644
--- a/after/plugin/snipMate.vim
+++ b/after/plugin/snipMate.vim
@@ -1,6 +1,6 @@
 " These are the mappings for snipMate.vim. Putting it here ensures that it
 " will be mapped after other plugins such as supertab.vim.
-if exists('s:did_snips_mappings') || &cp || version < 700
+if !exists('loaded_snips') || exists('s:did_snips_mappings')
 	finish
 endif
 let s:did_snips_mappings = 1
@@ -8,17 +8,26 @@ let s:did_snips_mappings = 1
 ino <silent> <tab> <c-r>=TriggerSnippet()<cr>
 snor <silent> <tab> <esc>i<right><c-r>=TriggerSnippet()<cr>
 ino <silent> <c-r><tab> <c-r>=ShowAvailableSnips()<cr>
+
+" The default mappings for these are annoying & sometimes break snipMate.
+" You can change them back if you want, I've put them here for convenience.
 snor <bs> b<bs>
-snor ' b<bs>'
 snor <right> <esc>a
 snor <left> <esc>bi
+snor ' b<bs>'
+snor ` b<bs>`
+snor % b<bs>%
+snor U b<bs>U
+snor ^ b<bs>^
+snor \ b<bs>\
+snor <c-x> b<bs><c-x>
 
 " By default load snippets in snippets_dir
 if empty(snippets_dir)
 	finish
 endif
 
-call GetSnippets(snippets_dir, '_') " Get global snippets 
+call GetSnippets(snippets_dir, '_') " Get global snippets
 
 au FileType * if &ft != 'help' | call GetSnippets(snippets_dir, &ft) | endif
 " vim:noet:sw=4:ts=4:ft=vim