escape quotes in custom-script
Merge remote-tracking branch 'origin/master'

Conflicts:
	pkg/boot-hpcloud-vm.hpi
Merge branch 'master' of /home/matty/projects/boot-hpcloud-vm with conflicts.
testing one two