Add PYTHONPATH for scrapy
Merge branch 'master' of github.com:cpatulea/dotfiles

Conflicts:
	.bashrc
Fix push.default option