Added latest setup.py changes to template