Simplified compat numpy and scipy so that they are just files.
Fixed minor rebase issue