moved submodules to master branches
Merge branch 'master' of git://github.com/millerjl1701/vimfiles
removed jj keymap due to issues with existing puppet code
redid key mappings for current workflow