Removed OmniComplete vimrc settings.
Removed jellybeans.vim
Added Remove ability to vpm
Installed vim-cpp-enhanced-highlight
Installed vim-surround
Installed auto-pairs
Set nocompatible

Some plugins need this.
Removed same word highlighting

Highlighting words that match the word under my cursor got annoying.
Added Ultisnip mappingings.
Added window navigation mappings to insert mode
Added some Emacs mappings

Ctrl-a moves the cursor to the beginning of the line.
Ctrl-e moved the cursor to the end of the line.
These can be used in Insert mode as well as Normal mode.
Merge branch 'master' of github.com:zachwhaley/dotfiles