ignoring pep8 within vim
Merge branch 'master' of github.com:devm33/dotfiles

Conflicts:
	vimrc