some code cleanup
fix problems reading salt and encdek
add crypto type into ouput
add support for scrypt (Android >= 4.4) encryption
Merge pull request #1 from EoD/master

Add support for scrypt / Android 4.4; code cleanup