Added bottleneck to travis environment
Attempting to fix bottleneck install
adding 3D test dataset
work on import 3D datasets
readding 3D datasets.  Need to have 3D_example.h5 in sima/tests/data to load
Merge branch 'master' of github.com:nbdanielson/sima into 3D_buddy
added z-plane trackpad / mouse scrolling
adding z-plane scrollbox in UI form
integration of z-plane scroll box into UI
scrolling through planes is fully integrated for base image toggling.
removed unnecessary code
work on toggling 3D rois
work on 3D ROI toggling between planes
saving and loading of 3D roi sets
adding back ellipse tool
Merge branch 'master' into 3D_buddy
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:jzaremba/sima
Removed bottleneck from travis test
Merge remote-tracking branch 'upstream/master'