Don't override KEY_BASE64 in Makefile
Merge branch 'master' of https://github.com/Pringley/secure-atm