Merge pull request #66 from jzaremba/master

Fixes for bad frames
Switch to use bottleneck.nanmean if available