Merge remote-tracking branch 'devel/cdat_no_dep_on_scipy'
Merge remote-tracking branch 'devel/fix_hurricane_test'
Merge remote-tracking branch 'devel/png_white_bg_optional'
cleaned up a bit docs
Merge branch 'updated_docs' into devel
fixes #354