cleanup and lastname-id bug fix during generating
Merge branch 'master' of https://github.com/simoncomputing/Ghost