Added baseimage with custom ssh key generation
Fixed Makefile conflicts