rm duplicate salt generator
Merge branch 'master' of github.com:dropofwill/granite