Gsoc2012 scilab

Just a quick merge + fix the build