Rename `template_path` argument into `template`
Merge remote-tracking branch 'source/master' into manager

Conflicts:
	scripts/cfn
	setup.py
	troposphere/__init__.py
	troposphere/iam.py
Merge remote-tracking branch 'source/master' into manager