Added self-updating behaviour to script.
Removed redundant 'pass'.
Merge branch 'alpha' of github.com:LordSputnik/waveplot-client into alpha

Conflicts:
	scanner/scanner.py