Adding a makefile to make things easy
Minor change
Adding common yaml
Fixing sshd config
Fixing j2 substitution
Minor reshuffling so they restart in the correct order