Add zsh installation option
Merge branch 'master' of https://github.com/marcw/packer-templates into marcw/zsh

Conflicts:
	symfony2/template.json
template.json reformating
fixed preseed for debian