Merge pull request #1 from marbindrakon/develop

Updating from upstream
Merge pull request #2 from marbindrakon/develop

Import: Add final C4 statics from Calaretu's listing
Merge pull request #3 from marbindrakon/develop

Updating from upstream
testing stuff
Merge remote-tracking branch 'origin/develop' into develop
testing 2
remove tests
Added eve-scout.com to intel list for Thera.
Merge pull request #4 from marbindrakon/develop

Pulling from origin.
Merge branch 'develop' of https://github.com/acdervis/eve-wspace into develop
Changed eve-scout conditional to use id instead of class for future-proofing.
Merge pull request #110 from acdervis/develop

Added eve-scout.com to intel list for Thera.