integrate changes from submodules
updated smex, gitignore