Heavily refactored. All put in one file.
Merge branch 'master' of github:Limdi/raspbian-image-admin