Updated to AES/CBC/PKCS5Padding
Merge branch 'master' of https://github.com/fchkam/Kent-is-an-asshole