add a keymap '<C-S>' to scroll on vim
hook CR to avoid collision between neocomplete and vim-endwise
add switch.vim and its keymaps: <C-C><C-C>
Merge branch 'master' of github.com:iaskell/dotfiles

Conflicts:
	.vimrc