[MRG] Fix ravel stuff

This should fix the current test issues and make everything consistent.
Warnings and tests for warnings will come in a separate PR soon.