diamond-ppa -> ppa
Merge pull request #3 from TheBits/set_hosts

Do not process the `diamond.conf` template if hosts variable is not set
Merge pull request #2 from TheBits/ppa

Allow to change ppa in pillar
Merge remote-tracking branch 'upstream/master'