- Adding softtabstop=4 to .py and expandtab globally
Merge branch 'master' of https://github.com/zooy0rk/dotfiles

Conflicts:
	.vimrc