current install of python is in /usr/local/bin
Merge remote-tracking branch 'origin/master'

Conflicts:
	.bashrc