Many changes

1. Make bashrc cleaner
2. Add init_svn in bashrc
3. Add pythonrc.py
4. Use vimdiff when git merge
Merge branch 'master' of github.com:yan12125/dotfiles

Conflicts:
	bashrc