Cleanup
Merge remote-tracking branch 'neeme/develop' into cleanup

Conflicts:
	udpcomm.py
Merge pull request #10 from Cougar/cleanup

Cleanup