small tweaks
xMerge branch 'master' of https://github.com/cookieninja/packerVagrant

Conflicts:
	packer/configs/Fedora-20-x86_64.json
	packer/configs/Fedora-20-x86_64.json~
	packer/configs/ubuntu-14.10-Desktop-amd64.json
	packer/configs/ubuntuGnome-14.10-Desktop-amd64.json