Merge branch 'master' of git://github.com/vsooda/vimrc

Conflicts:
	my_configs.vim

my_configs.vim

@@ -8,6 +8,9 @@ set pastetoggle=<F2>
 let Tlist_Use_Split_Window = 1
 "sudo apt-get install ncurses-term
 "export TERM=xterm-256color(.bashrc)
+let g:molokai_original = 1
+let g:rehash256 = 1
+:set nu
 colorscheme molokai
 "colorscheme monokai
 inoremap {} {<esc>o}<esc>O