adding KeyboardInterrupt catch to olap and broker
Fixed width issue with toolbar windows
Merge pull request #535 from brooksryba/develop

Fixed width issue with toolbar windows
Got rid of 100% widths that were causing weird glitches in google chrome. Instead uses a less variable to keep track of the toolbar width
Merge pull request #536 from brooksryba/develop

Got rid of 100% widths that were causing weird glitches in google chrome...
mutipoint for charts
Merge pull request #537 from Tendrid/develop

charts
Merge pull request #538 from demaagdk/develop

Develop
Update scripts/setup.sh
Update pip.requirements

matplotlib 1.1.1rc no longer available
Merge pull request #2 from sightmachine/develop

Develop
Update pip.requirements
Merge pull request #539 from oostendo/develop

Develop
datetime bug
Merge pull request #540 from Tendrid/develop

datetime bug
allow user-defined messages in tolerances