remove comment about linux/unix/mac/windows
merge
move numpy so that we don't get an import future error