diff --git a/.hgsub b/.hgsub
index fb094db..557bf15 100644
--- a/.hgsub
+++ b/.hgsub
@@ -24,3 +24,6 @@ bundle/git_nerdtree = [git]https://github.com/scrooloose/nerdtree.git
 bundle/git_css = [git]https://github.com/skammer/vim-css-color.git
 bundle/ft_git_matchtagalways = [git]https://github.com/Valloric/MatchTagAlways.git
 bundle/git_vim-snippets = [git]https://github.com/honza/vim-snippets.git
+bundle/git_jedi = [git]https://github.com/davidhalter/jedi-vim.git
+bundle/git_multiple-cursors = [git]https://github.com/terryma/vim-multiple-cursors.git
+bundle/git_html5 = [git]https://github.com/othree/html5.vim.git
diff --git a/.hgsubstate b/.hgsubstate
index 7b9d934..a62cdb1 100644
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -6,20 +6,23 @@
 186ae21ab46bb1c2830434160a77cc1352646f77 bundle/git_calendar
 417eaf8a20a6208e34ff167f5636b20f8f812ed8 bundle/git_css
 b5d3fe66a58a13d2ff8b6391f4387608496a030f bundle/git_ctrlp
-0a19a3e78ff01276943294e2b812873552fe3c4b bundle/git_fugitive
+188692556a025db6ad4c7324961253469979b348 bundle/git_fugitive
 3975ac871565115e3769dc69c06bc88ddc1369af bundle/git_gundo
+10dca03366fca80a2b9ec7aed49d2864bcadb8ef bundle/git_html5
+c32844dfec93569e9e10228703ea535dc70d8b8b bundle/git_jedi
 10073c3a3c363c34681c2e37ae29e9675e2cde90 bundle/git_markdown
+35028be1f71953da9f2c28509bf6c5ebd1d31c28 bundle/git_multiple-cursors
 0b3d928dce8262dedfc2f83b9aeb59a94e4f0ae4 bundle/git_nerdcommenter
-b0bb781fc73ef40365e4c996a16f04368d64fc9d bundle/git_nerdtree
+55a8954c48d94c207facb1a0ba109a427b15bcbf bundle/git_nerdtree
 2a3c5f8e3c26a57b8eb4cfc4be79615a1c508ef6 bundle/git_repeat
 43b1d37479af91cac00d01d4e20b7b7e1b94adfb bundle/git_riv
 f85cb4e788356f664d033e8519abdd8e1bc26762 bundle/git_surround
-3ebdeabf63eb2f093ccd79c1c9f4d8e198488d5b bundle/git_syntastic
-9bf4fd99e4b460c547207b0f0bc3557280874b61 bundle/git_tagbar
+0bef7ef3f608f162eba0daee63acd13b3456efcb bundle/git_syntastic
+59c9b7ce1cc70ac2c7bd3c858e80c89f17b42cc9 bundle/git_tagbar
 7b84e352ed1e395fc54f5a3f60faf4aef9da9f41 bundle/git_taglisttoo
-e59a60cbeae315218b93ab495954ef2a527a875c bundle/git_ultisnips
+7b8641e1fd49ca9a048b636d9838b5fea6da9536 bundle/git_ultisnips
 c0d27010dd0c96884cfd34c3af621ae009109c69 bundle/git_vcscommand
 f8122fd1caca68b2592553e43dad45b3dc445a06 bundle/git_vim-javascript
 1e2f98f4366c6dec27fa8df72971fa9fa33e9f07 bundle/git_vim-nodejs-complete
-fa45583c4dc16d3b7e3d25a749ce5f50927bf4d5 bundle/git_vim-snippets
+368acf7e2752d6c5914d3f45f938dee6525788a2 bundle/git_vim-snippets
 757f513c621a48cf34d5b343ddb405ae731b3e38 bundle/git_zoom
diff --git a/.vimrc b/.vimrc
index e8a767a..89acba4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -213,8 +213,8 @@ let g:riv_auto_format_table = 0
 "KEYS: User defined keyboard shortcuts {{{
 
 "Cycle through buffers.
-map <C-p> :bp<CR>
-map <C-n> :bn<CR>
+" map <C-p> :bp<CR>
+" map <C-n> :bn<CR>
 
 map <F5> :call <SID>Make()<cr>
 
diff --git a/bundle/ft_javascript/ftplugin/javascript/common.vim b/bundle/ft_javascript/ftplugin/javascript/common.vim
new file mode 100644
index 0000000..7c3fed7
--- /dev/null
+++ b/bundle/ft_javascript/ftplugin/javascript/common.vim
@@ -0,0 +1,2 @@
+setlocal foldmethod=syntax
+setlocal list