Added back method calls in __init__()
Merge branch 'master' of http://github.com/toomanycats/Motor_tools into Combined

Conflicts:
	test.py
merged
ignore backups from merge xxdiff