change parameter parssing order
Merge branch 'master' of github.com:maggick/transmission-control

Conflicts:
	transmission_control.py