Cnahge user name to pshchelo
Merge branch 'master' of github.com:pshchelo/dotfiles

Conflicts:
	ipython/ipython_config.py