Merge branch 'release/2.1.0' into develop
Updated iterm config
Updated gitconfig
Updated vimrc from template
Update zshenv
Updated submodules
Merge branch 'release/2.1.1'