Added bottleneck to travis environment
Attempting to fix bottleneck install
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'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix to allow the whole frame alignemnt to be a bit more forgiving of bad data.
Fix for all NaN frames
Minor formatting and comment changes
Merge remote-tracking branch 'upstream/master'
Merge pull request #66 from jzaremba/master

Fixes for bad frames