Merge pull request #853 from brooksryba/develop

Tooltip stuff
added support for olap in filtercollection
Merge pull request #854 from Tendrid/develop

added support for olap in filtercollection
Close Button positioning derp
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop