Make Cmd-Space work for completion always. Display tab numbers

vim/plugin/settings/neocomplcache.vim

@@ -12,8 +12,8 @@ let g:neocomplcache_max_list = 5
 " words less than 3 letters long aren't worth completing
 let g:neocomplcache_auto_completion_start_length = 3
 
-" Choose completions using Apple-Space
-inoremap <expr><D-Space>  pumvisible() ? "\<C-n>" : "\<TAB>"
+" Map standard Ctrl-N completion to Cmd-Space
+inoremap <D-Space> <C-n>
 
 " This makes sure we use neocomplcache completefunc instead of 
 " the one in rails.vim, otherwise this plugin will crap out

vim/plugin/settings/skwp-keymap.vim

@@ -9,7 +9,7 @@ nnoremap ,yw yiww
 
 " ,ow = 'overwrite word', replace a word with what's in the yank buffer
 " FIXME: will not properly repeat when you use a dot (tie into repeat.vim)
-nnoremap ,ow viwp 
+nnoremap ,ow viwp
 
 "make Y consistent with C and D
 nnoremap Y y$