Large cleanup to make cookbook usable
Merge pull request #2 from retr0h/big-cleanup

Large cleanup to make cookbook usable