Removes/replaces non-free code using patch from upstream. Also, scilab will have to be removed from the blacklist.
