Merge branch 'issue-20' into aws-boxes

Conflicts:
	debian-6-amd64/default.json
	debian-6-amd64/plain.json
	debian-7-amd64/default.json
	debian-7-amd64/plain.json