Updated the default config with the latest apps and engines.
Also updated application launch paths to use more recent
versions of DCC software, e.g. Maya 2014, Nuke 8 etc.
wip mari changes
Merge branch 'master' into 26124_Mari

Conflicts:
	env/asset.yml
	env/asset_step.yml
	env/includes/app_launchers.yml
	env/includes/paths.yml
	env/project.yml
	env/shotgun_asset.yml
	env/shotgun_project.yml
	env/shotgun_task.yml
Removed all git references in Mari config
Updated with latest versions of apps and engines for Mari