submodule functions, mark more submods.
Merge branch 'master' into sinatra