Update Linux
Update Linux
Merge branch 'working'

Conflicts:
	Packages/Default/new_templates-keermel-0430.pyc
	Packages/User/Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	Packages/User/Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	Packages/User/Package Control.last-run