Fix apt key not being a key

This prevents the key from being constantly re-added everytime puppet is run
due to apt not detecting that the key is already present.
Merge remote-tracking branch 'johnnyg/fix-apt-key'

Conflicts:
	manifests/repo/apt.pp