moved command line arguments to specific programs
Merge branch 'master' of https://github.com/bergzand/domos

Conflicts:
	domos/server.py