Refactored. Didn't break it this time!
Small changes.
Merge branch 'alternate'

Conflicts:
	README.md
	client/Rules.make
	client/src/devtypes.h
	client/src/fparse.c
	client/src/main.c
	client/src/usb-operations.c