bump to scala 2.10.4
Merge branch 'master' of github.com:nremond/pbkdf2-scala