Tweaks
Merge branch 'siggraph_latest' of ssh://git@github.com/shotgunsoftware/tk-config-default.git into siggraph_latest

Conflicts:
	env/asset.yml
	env/asset_step.yml
	env/project.yml
	env/sequence.yml
	env/shot.yml
	env/shot_step.yml
Merge branch 'siggraph_latest' of ssh://git@github.com/shotgunsoftware/tk-config-default.git into siggraph_latest

Conflicts:
	env/project.yml