Merge pull request #42 from rmariano/fixes

Fixes

.vimrc

@@ -171,3 +171,5 @@ nnoremap <leader>e :set number!<CR>
 autocmd FileType xml map <F3> :call FormatXML()<CR>
 "" Remove trailing white spaces upon saving
 autocmd BufWritePre * :%s/\s\+$//e
+"" Python: Highlight everything
+let g:python_highlight_all = 1

Makefile

@@ -77,10 +77,10 @@ extras: flake8 fugitive nerdtree
 # make install BRANCH=<branch>
 .PHONY: install
 install: dirs
-	@wget -O /tmp/vimconfig.zip $(REPO_HOME)/archive/$(BRANCH).zip
-	@mkdir -p /tmp/vimconfig
-	@unzip -d /tmp/vimconfig /tmp/vimconfig.zip
-	$(MAKE) -C /tmp/vimconfig/vim-config-$(BRANCH) deploy
+	rm -fr /tmp/vimconfig && mkdir -p /tmp/vimconfig
+	@wget -O /tmp/vimconfig/vimconfig.zip $(REPO_HOME)/archive/$(BRANCH).zip
+	@unzip -d /tmp/vimconfig /tmp/vimconfig/vimconfig.zip
+	@cd /tmp/vimconfig/vim-config-$(BRANCH) && make deploy && cd -
 
 # make changelog TAG=<tag>
 .PHONY: changelog

README.rst

@@ -83,8 +83,10 @@ Features
 
   * ``<F2>``: toggle spell check.
   * ``<F3>``: Correct files automatically
-    * For XML with correct the formatting
-    * Python files: auto-PEP-8, correct imports, and run ``flake8`` checks.
+
+    * XML: auto-format & indent.
+    * Python: PEP-8, sort imports, and run ``flake8`` checks.
+
   * ``<F4>``: toggle paste mode
 
 * ``<leader>`` +  ``nh`` as a shortcut for ``:nohlsearch``

after/ftplugin/python.vim

@@ -2,8 +2,6 @@
 
 "" Shortcut for commenting out lines in python files
 nnoremap <buffer> <localleader>c I# <ESC>
-"" Highlight everything
-let g:python_highlight_all = 1
 
 function! AutofixPy()
     echom "Correcting Python file"