Tom - fixing bug and tidy up
Tom - adding code to remove the old archive after building
Tom - adding code to deal with zips