local changes from macbook pro
Merge branch 'JM' of https://github.com/agnwinds/python into JM

Conflicts:
	python.c
	templates.h
Merge branch 'JM' of https://github.com/agnwinds/python into JM
Merge branch 'JM' of https://github.com/agnwinds/python into JM
This is a branch for macro testing