Made makefile support some errors
Some more experimental and corrections
Removing backup use
Merge branch 'master' of github.com:joninvski/vim

Conflicts:
	vimrc