Fixed scrypt naming conventions
Merge branch 'master' of github.com:syncoin-project/syncoin