Clean up of installer
Merge pull request #25 from strangebutwonderful/new_setup

Clean up of installer