Merge pull request #1118 from Tendrid/develop

Error state for state machine
Updates to the table css stuff
Merge pull request #1119 from ahomatthew/develop

Updates to the table css stuff
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop