Fix .gitignore file
Review vimrc with the help of bling/dotvim
Merge branch 'master' of https://github.com/lompy/dotvim

Conflicts:
	.vim/vimrc