minor refactoring of rakefile
Update submodule
autosetuprebase = always