Generate image name with server name
minor cleanup
Merge pull request #189 from ameade/image-name

Generate image name with server name