start ssh-agent in bashrc if its not already (for pythonanywhere)
Merge branch 'master' of github.com:hjwp/dotfiles

Resolved Conflicts:
	.bashrc