scrolling without moving cursor with C-e/C-y
Merge branch '3.0' of github.com:jonaustin/spf13-vim into 3.0

* '3.0' of github.com:jonaustin/spf13-vim:
  vimrc updates