Added username, sitename to hash
Merge branch 'master' of github.com:xanderlin/narwhal
Merge branch 'master' of github.com:xanderlin/narwhal
secured the random numbers