Named everything with dashes.

Fixed several bugs in calamari-setup.py.
This now comes up without errors.

I still need to add code to the qa suites to implement that smoketests.