Added comments to make clearer.
Cleaned up code, added initial triggers; not working!
Merge remote-tracking branch 'origin/master'

Conflicts:
	flexidata.py